diff options
author | Joe MacDonald <joe@deserted.net> | 2013-11-04 11:50:32 -0500 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2013-11-04 12:41:45 -0800 |
commit | 62b5ee7ea3c44248d5482fb136f2d2e64cc1bbca (patch) | |
tree | 2de5fdbe3205e4e05674552fe8fd4efb77872d6b /recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch | |
parent | cac0cef10cb7dc66d64c2e403b61457f5ba79bab (diff) | |
download | meta-security-62b5ee7ea3c44248d5482fb136f2d2e64cc1bbca.tar.gz |
libseccomp: add latest stable version, add ptest
A new stable version of libseccomp is available, so update the recipe. At
the same time, integrate the ptest support that's currently being
discussed on the libseccomp list.
Signed-off-by: Joe MacDonald <joe@deserted.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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.patch | 61 |
1 files changed, 61 insertions, 0 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 new file mode 100644 index 0000000..52ae751 --- /dev/null +++ b/recipes-security/libseccomp/files/0002-tests-install-python-tests-if-appropriate.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From 49dd92b85ca1797f2d289f48d3c1cdaec678334b Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe MacDonald <joe@deserted.net> | ||
3 | Date: Mon, 28 Oct 2013 15:40:15 -0400 | ||
4 | Subject: [PATCH 2/3] tests: install python tests if appropriate | ||
5 | |||
6 | Install the python tests in addition to the C tests if python bindings are | ||
7 | being built. The regression script can, and needs to, have the | ||
8 | modification of the PYTHONPATH removed since it's unlikely in this | ||
9 | scenario that the original source tree will be around at all anymore. | ||
10 | This shouldn't be a problem since the library should be installed to the | ||
11 | default PYTHONPATH anyway. | ||
12 | |||
13 | Upstream-Status: Submitted [http://www.mail-archive.com/libseccomp-discuss@lists.sourceforge.net/msg00470.html] | ||
14 | |||
15 | Signed-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 | |||
21 | diff --git a/macros.mk b/macros.mk | ||
22 | index 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 = \ | ||
35 | diff --git a/tests/Makefile b/tests/Makefile | ||
36 | index 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 | -- | ||
60 | 1.7.10.4 | ||
61 | |||