mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Ben Pfaff 2010-07-15 10:50:33 -07:00
parent 17ee3c1ffd
commit 7454ec7a74
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/automake.mk
View File

@ -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) check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
rm -fr tests/coverage.html tests/coverage.info rm -fr tests/coverage.html tests/coverage.info
$(LCOV) -c -i -o - > 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=$$?; \ rc=$$?; \
echo "Producing coverage.html..."; \ echo "Producing coverage.html..."; \
cd tests && genhtml -q -o coverage.html coverage.info; \ cd tests && genhtml -q -o coverage.html coverage.info; \

5
tests/lcov-wrapper.in
View File

@ -31,6 +31,11 @@ fi
PATH=$new_path PATH=$new_path
export 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 # XXX Probably want some kind of synchronization here to deal with
# programs running in parallel. # programs running in parallel.
LCOV="lcov -b $abs_top_builddir -d $abs_top_builddir -q" LCOV="lcov -b $abs_top_builddir -d $abs_top_builddir -q"

6
tests/ovs-vsctl.at
View File

@ -721,6 +721,12 @@ AT_CLEANUP
AT_SETUP([database commands -- wait-until must wait]) AT_SETUP([database commands -- wait-until must wait])
AT_KEYWORDS([ovs-vsctl]) 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 OVS_VSCTL_SETUP
# Start ovs-vsctls in background. # Start ovs-vsctls in background.