tests: Disable profiling for "wait-until must wait" test.

This test tends to break when run with lcov profiling since the lcov
wrapper script can't synchronize access to profiling data across all the
ovs-vsctl instances running in parallel.

diff --git a/tests/automake.mk b/tests/automake.mk
index 51205d9b86a07b9933262e2a468055a91afeabc3..48aa5aa18bfc48cf532026153f38d45bd5ef6d4e 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -92,7 +92,7 @@ LCOV = lcov -b $(abs_top_builddir) -d $(abs_top_builddir) -q
 check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
        rm -fr tests/coverage.html tests/coverage.info
        $(LCOV) -c -i -o - > tests/coverage.info
-       $(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
+       $(SHELL) '$(TESTSUITE)' -C tests CHECK_LCOV=true DISABLE_LCOV=false AUTOTEST_PATH='tests/lcov:$(AUTOTEST_PATH)' $(TESTSUITEFLAGS); \
                rc=$$?; \
                echo "Producing coverage.html..."; \
                cd tests && genhtml -q -o coverage.html coverage.info; \

diff --git a/tests/lcov-wrapper.in b/tests/lcov-wrapper.in
index 1981cdaebe5bda7a0f176a19c67fc9d33870d1bf..0c6a3591522c40a73466a8c44744b98eaa161cf8 100755 (executable)
--- a/tests/lcov-wrapper.in
+++ b/tests/lcov-wrapper.in
@@ -31,6 +31,11 @@ fi
 PATH=$new_path
 export PATH
 
+if test "$DISABLE_LCOV" = true; then
+    exec $wrap_program "$@"
+    exit 1
+fi
+
 # XXX Probably want some kind of synchronization here to deal with
 # programs running in parallel.
 LCOV="lcov -b $abs_top_builddir -d $abs_top_builddir -q"

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index fa882b0c728487001ce7e51f0344bb39cd69c6f8..061a4f48071e55e814079bc37e57ac2749eed939 100644 (file)
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -721,6 +721,12 @@ AT_CLEANUP
 
 AT_SETUP([database commands -- wait-until must wait])
 AT_KEYWORDS([ovs-vsctl])
+
+# Disable lcov for this test.  All the programs running in parallel
+# race badly on access to profiling data.
+DISABLE_LCOV=true
+export DISABLE_LCOV
+
 OVS_VSCTL_SETUP
 
 # Start ovs-vsctls in background.