summaryrefslogtreecommitdiffstats
path: root/recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch')
-rw-r--r--recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch b/recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch
deleted file mode 100644
index 52ae751..0000000
--- a/recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 49dd92b85ca1797f2d289f48d3c1cdaec678334b Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe@deserted.net>
3Date: Mon, 28 Oct 2013 15:40:15 -0400
4Subject: [PATCH 2/3] tests: install python tests if appropriate
5
6Install the python tests in addition to the C tests if python bindings are
7being built. The regression script can, and needs to, have the
8modification of the PYTHONPATH removed since it's unlikely in this
9scenario that the original source tree will be around at all anymore.
10This shouldn't be a problem since the library should be installed to the
11default PYTHONPATH anyway.
12
13Upstream-Status: Submitted [http://www.mail-archive.com/libseccomp-discuss@lists.sourceforge.net/msg00470.html]
14
15Signed-off-by: Joe MacDonald <joe@deserted.net>
16---
17 macros.mk | 3 ++-
18 tests/Makefile | 6 +++++-
19 2 files changed, 7 insertions(+), 2 deletions(-)
20
21diff --git a/macros.mk b/macros.mk
22index e7c196d..13e7ed3 100644
23--- a/macros.mk
24+++ b/macros.mk
25@@ -221,7 +221,8 @@ INSTALL_REGRESSION_TEST_MACRO += \
26 $(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
27 -d "$(INSTALL_TEST_DIR)"; \
28 $(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0755 \
29- regression "$(INSTALL_TEST_DIR)";
30+ regression "$(INSTALL_TEST_DIR)"; \
31+ $(SED) -i "/\/..\/src\/python\/build\/lib\./d" "$(INSTALL_TEST_DIR)/regression";
32
33 ifeq ($(V),0)
34 INSTALL_MAN1_MACRO = \
35diff --git a/tests/Makefile b/tests/Makefile
36index 135551c..309a570 100644
37--- a/tests/Makefile
38+++ b/tests/Makefile
39@@ -78,6 +78,10 @@ all: $(TESTS) $(OBJS)
40
41 -include $(DEPS_TESTS) $(DEPS_OBJS)
42
43+ifeq ($(CONF_BINDINGS_PYTHON), 1)
44+ PY_TESTS = $(TESTS:%=%.py)
45+endif
46+
47 $(DEPS_TESTS):
48 $(MAKEDEP_EXEC)
49 $(ADDDEP) $@ ../src/libseccomp.a
50@@ -92,7 +96,7 @@ $(TEST_PRIVATE): 00-test.c $(OBJS) ../src/libseccomp.a
51 check: $(TESTS)
52 ./regression
53
54-install-tests: $(TESTS) $(TESTS:%=%.tests)
55+install-tests: $(TESTS) $(TESTS:%=%.tests) $(PY_TESTS)
56 $(INSTALL_TEST_MACRO)
57 $(INSTALL_REGRESSION_TEST_MACRO)
58
59--
601.7.10.4
61