Skip to content

Commit

Permalink
tests: Disable profiling for "wait-until must wait" test.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
blp committed Jul 21, 2010
1 parent 17ee3c1 commit 7454ec7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tests/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
5 changes: 5 additions & 0 deletions tests/lcov-wrapper.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions tests/ovs-vsctl.at
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 7454ec7

Please sign in to comment.