summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-03 13:23:58 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-03 13:23:58 -0400
commit62e6513b48009adba289243155b93da3212c00c2 (patch)
tree3cb44c91107068ec63fbe3c292c8315950576026 /Makefile.am
parent6de49f4d9a9c0f0788e44e7199b935e175fb0ad4 (diff)
downloadtor-62e6513b48009adba289243155b93da3212c00c2.tar.gz
tor-62e6513b48009adba289243155b93da3212c00c2.zip
When building with coverage, run chutney with coverage
Previously, this required me to do stuff like 'cp src/or/tor-cov src/or/tor' , which is pretty embarrassing.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 784ff48dcd..5b4d59c514 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,11 @@ EXTRA_DIST+= \
if COVERAGE_ENABLED
TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage
TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE
+TEST_NETWORK_FLAGS="--coverage"
else
TEST_CFLAGS=
TEST_CPPFLAGS=-DTOR_UNIT_TESTS
+TEST_NETWORK_FLAGS=
endif
#install-data-local:
@@ -79,7 +81,7 @@ need-chutney-path:
# Note that test-network requires a copy of Chutney in $CHUTNEY_PATH.
# Chutney can be cloned from https://git.torproject.org/chutney.git .
test-network: need-chutney-path all
- $(top_srcdir)/src/test/test-network.sh
+ $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS)
need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \