summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2015-03-20 13:12:09 +0100
committerSebastian Hahn <sebastian@torproject.org>2015-03-21 02:34:44 +0100
commit1228dd293b60a8eaab03472fa29428c5e2752c44 (patch)
tree4fd6ddc086e7baf44dbbde8f79d8e7b6a182ffc2 /src/test/include.am
parent348f2744cf0d026b1bd06a11d599f0ecf675038d (diff)
downloadtor-1228dd293b60a8eaab03472fa29428c5e2752c44.tar.gz
tor-1228dd293b60a8eaab03472fa29428c5e2752c44.zip
Disable assertions during coverage builds
This removes roughly 5000 branches in my testing. We never want to trigger assertions even during tests, so this is sane. Implements #15400.
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am
index c56e887ca0..089c6229cb 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -76,7 +76,7 @@ src_test_test_slow_SOURCES = \
src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
-src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS)
+src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_test_bench_SOURCES = \
src/test/bench.c
@@ -151,7 +151,7 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
@TOR_LIB_MATH@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@
src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
-src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS)
+src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR)