diff options
author | Sebastian Hahn <sebastian@torproject.org> | 2015-03-20 13:12:09 +0100 |
---|---|---|
committer | Sebastian Hahn <sebastian@torproject.org> | 2015-03-21 02:34:44 +0100 |
commit | 1228dd293b60a8eaab03472fa29428c5e2752c44 (patch) | |
tree | 4fd6ddc086e7baf44dbbde8f79d8e7b6a182ffc2 /src/or/include.am | |
parent | 348f2744cf0d026b1bd06a11d599f0ecf675038d (diff) | |
download | tor-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/or/include.am')
-rw-r--r-- | src/or/include.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/include.am b/src/or/include.am index 92980932d1..c7f22abc8d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -99,7 +99,7 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" -src_or_libtor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. @@ -116,7 +116,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ if COVERAGE_ENABLED src_or_tor_cov_SOURCES = src/or/tor_main.c -src_or_tor_cov_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ |