diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 6fd94058e4..cd88264264 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,10 +3,6 @@ # Copyright (c) 2007-2015, The Tor Project, Inc. # See LICENSE for licensing information -# "foreign" means we don't follow GNU package layout standards -# 1.9 means we require automake vesion 1.9 -AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects - ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES= @@ -42,7 +38,11 @@ EXTRA_DIST+= \ if COVERAGE_ENABLED TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage +if DISABLE_ASSERTS_IN_UNIT_TESTS +TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -DDISABLE_ASSERTS_IN_UNIT_TESTS +else TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE +endif TEST_NETWORK_FLAGS=--coverage --hs-multi-client 1 else TEST_CFLAGS= @@ -73,8 +73,6 @@ dist-rpm: dist-gzip echo "RPM build finished"; \ #end of dist-rpm -dist: check - doxygen: doxygen && cd doc/doxygen/latex && make @@ -136,10 +134,10 @@ need-stem-path: exit 1; \ fi -test-stem: need-stem-path $(TESTING_TOR_BINARY) +test-stem: need-stem-path all @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; -test-stem-full: need-stem-path $(TESTING_TOR_BINARY) +test-stem-full: need-stem-path all @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL,ONLINE -v; test-full: need-stem-path need-chutney-path check test-network test-stem |