[ovs-dev] [PATCH] tests: Fix double-rebuild of testsuite for "check-valgrind".

Andy Zhou azhou at ovn.org
Tue Oct 11 23:58:26 UTC 2016


On Wed, Oct 5, 2016 at 6:28 PM, Ben Pfaff <blp at ovn.org> wrote:

> When I ran "make check-valgrind -j10" and the testsuite needed to be
> rebuilt, two copies of it were rebuilt in parallel and sometimes they
> raced with each other.  I don't have the full story on exactly why this
> happened, but this commit, which eliminates redundant dependencies from
> check-* targets, fixes the problem for me.  The dependencies are redundant
> because these targets depend on "all", which also depends on them.
>
> Signed-off-by: Ben Pfaff <blp at ovn.org>
>

I was not clear to me either why the race happened, but the change looks
good to me.

Acked-by: Andy Zhou <azhou at ovn.org>

There are two additional targets that have the similar pattern, wonder if
we should change them as well...


diff --git a/tests/automake.mk b/tests/automake.mk
index f022feb..c170ae7 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -223,8 +223,7 @@ check-valgrind: all $(valgrind_wrappers) $(check_DATA)
        @echo
'----------------------------------------------------------------------'
        @echo 'Valgrind output can be found in
tests/testsuite.dir/*/valgrind.*'
        @echo
'----------------------------------------------------------------------'
-check-helgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
-                $(valgrind_wrappers) $(check_DATA)
+check-helgrind: all $(valgrind_wrappers) $(check_DATA)
        -$(SHELL) '$(TESTSUITE)' -C tests CHECK_VALGRIND=true
VALGRIND='$(HELGRIND)' AUTOTEST_PATH='tests/valgri

 ^L
@@ -245,7 +244,7 @@ check-kernel: all
        "$$@" || (test X'$(RECHECK)' = Xyes && "$$@" --recheck)

 # Testing the out of tree Kernel module
-check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
+check-kmod: all
        $(MAKE) modules_install
        modprobe -r -a vport-geneve vport-gre vport-lisp vport-stt
vport-vxlan openvswitch
        $(MAKE) check-kernel


>



More information about the dev mailing list