Install the python tests in addition to the C tests if python bindings are
being built. The regression script can, and needs to, have the
modification of the PYTHONPATH removed since it's unlikely in this
scenario that the original source tree will be around at all anymore.
This shouldn't be a problem since the library should be installed to the
default PYTHONPATH anyway.
Signed-off-by: Joe MacDonald <j...@deserted.net>
---
macros.mk | 3 ++-
tests/Makefile | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/macros.mk b/macros.mk
index b33bfae..82de8ee 100644
--- a/macros.mk
+++ b/macros.mk
@@ -221,7 +221,8 @@ INSTALL_REGRESSION_TEST_MACRO += \
-d "$(INSTALL_TEST_DIR)"; \
$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0755 \
regression "$(INSTALL_TEST_DIR)"; \
- $(SED) -i "s=../tools/=$(INSTALL_BIN_DIR)/="
"$(INSTALL_TEST_DIR)/regression";
+ $(SED) -i "s=../tools/=$(INSTALL_BIN_DIR)/="
"$(INSTALL_TEST_DIR)/regression"; \
+ $(SED) -i "/\/..\/src\/python\/build\/lib\./d"
"$(INSTALL_TEST_DIR)/regression";
ifeq ($(V),0)
INSTALL_MAN1_MACRO = \
diff --git a/tests/Makefile b/tests/Makefile
index 49277ec..614bd82 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -78,6 +78,10 @@ all: $(TESTS) $(OBJS)
-include $(DEPS_TESTS) $(DEPS_OBJS)
+ifeq ($(CONF_BINDINGS_PYTHON), 1)
+ PY_TESTS = $(TESTS:%=%.py)
+endif
+
$(DEPS_TESTS):
$(MAKEDEP_EXEC)
$(ADDDEP) $@ ../src/libseccomp.a
@@ -89,7 +93,7 @@ $(TESTS):
$(TEST_PRIVATE): 00-test.c $(OBJS) ../src/libseccomp.a
$(COMPILE_EXEC)
-install-tests: $(TESTS) $(TESTS:%=%.tests)
+install-tests: $(TESTS) $(TESTS:%=%.tests) $(PY_TESTS)
$(INSTALL_TEST_MACRO)
$(INSTALL_REGRESSION_TEST_MACRO)
--
1.7.10.4
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
libseccomp-discuss mailing list
libseccomp-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libseccomp-discuss
