'make check-system-userspace', 'make check-kernel' and 'make check-kmod'
work with real environment and can not be run simultaneously.
To prevent violation of the system environment strip out options for
parallel execution from TESTSUITEFLAGS for this targets.
Signed-off-by: Ilya Maximets <i.maxim...@samsung.com>
---
tests/automake.mk | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/automake.mk b/tests/automake.mk
index 592f648..fd4d31d 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -207,9 +207,19 @@ check-ryu: all
$(AM_V_at)srcdir='$(srcdir)' $(SHELL) $(srcdir)/tests/run-ryu
EXTRA_DIST += tests/run-ryu
+
+TESTSUITEFLAGS_WITHOUT_JOBS = $(shell echo '$(TESTSUITEFLAGS)' | sed -r 's/(^|
)(-j|--jobs=) *[0-9]+//g')
+
+define CHECK_JOBS_FLAG =
+ @(test "$(TESTSUITEFLAGS_WITHOUT_JOBS)" != "$(TESTSUITEFLAGS)" \
+ && echo "Options for parallel execution aren't supported for
$(1)." \
+ && echo "New TESTSUITEFLAGS='$(TESTSUITEFLAGS_WITHOUT_JOBS)'")
|| true
+endef
+
# Run kmod tests. Assume kernel modules has been installed or linked into the
kernel
check-kernel: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
- $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests
AUTOTEST_PATH='$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+ $(call CHECK_JOBS_FLAG,$(SYSTEM_KMOD_TESTSUITE))
+ $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests
AUTOTEST_PATH='$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS_WITHOUT_JOBS)
# Testing the out of tree Kernel module
check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
@@ -218,7 +228,8 @@ check-kmod: all tests/atconfig tests/atlocal
$(SYSTEM_KMOD_TESTSUITE)
$(MAKE) check-kernel
check-system-userspace: all tests/atconfig tests/atlocal
$(SYSTEM_USERSPACE_TESTSUITE)
- $(SHELL) '$(SYSTEM_USERSPACE_TESTSUITE)' -C tests
AUTOTEST_PATH='$(AUTOTEST_PATH)' $(TESTSUITEFLAGS)
+ $(call CHECK_JOBS_FLAG,$(SYSTEM_USERSPACE_TESTSUITE))
+ $(SHELL) '$(SYSTEM_USERSPACE_TESTSUITE)' -C tests
AUTOTEST_PATH='$(AUTOTEST_PATH)' $(TESTSUITEFLAGS_WITHOUT_JOBS)
clean-local:
test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
