valgrind tests always runs with '-d' option which breaks the re-checking. Lets just drop the rechecking support for these targets.
Signed-off-by: Ilya Maximets <[email protected]> --- tests/automake.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/automake.mk b/tests/automake.mk index 366de0b1e..6a7747cb5 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -261,15 +261,13 @@ check-valgrind: all $(valgrind_wrappers) $(check_DATA) @echo 'Valgrind output can be found in tests/testsuite.dir/*/valgrind.*' @echo '----------------------------------------------------------------------' check-kernel-valgrind: all $(valgrind_wrappers) $(check_DATA) - set $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d; \ - "$$@" $(TESTSUITEFLAGS) -j1 || (test X'$(RECHECK)' = Xyes && "$$@" --recheck) + $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS) -j1 @echo @echo '----------------------------------------------------------------------' @echo 'Valgrind output can be found in tests/system-kmod-testsuite.dir/*/valgrind.*' @echo '----------------------------------------------------------------------' check-userspace-valgrind: all $(valgrind_wrappers) $(check_DATA) - set $(SHELL) '$(SYSTEM_USERSPACE_TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d; \ - "$$@" $(TESTSUITEFLAGS) -j1 || (test X'$(RECHECK)' = Xyes && "$$@" --recheck) + $(SHELL) '$(SYSTEM_USERSPACE_TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS) -j1 @echo @echo '----------------------------------------------------------------------' @echo 'Valgrind output can be found in tests/system-userspace-testsuite.dir/*/valgrind.*' -- 2.17.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
