diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-10 15:38:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-10 15:38:52 -0500 |
| commit | 69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5 (patch) | |
| tree | a0742ef91ea8dde163cfdc60fe359b17a4d1b619 /src/common | |
| parent | 4dc8dc4b89259e1418cd984abe1cd8d8fc6a7496 (diff) | |
| parent | 55d6fd27cbe6f058a1f444f47f05c7b64891655e (diff) | |
| download | tor-69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5.tar.gz tor-69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5.zip | |
Merge remote-tracking branch 'sebastian/bug18242'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/util.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/util.h b/src/common/util.h index 165bc0dcb3..d05ffa7d10 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -45,9 +45,10 @@ #error "Sorry; we don't support building with NDEBUG." #endif -/* Don't use assertions during coverage. It leads to tons of unreached - * branches which in reality are only assertions we didn't hit. */ -#ifdef TOR_COVERAGE +/* Sometimes we don't want to use assertions during branch coverage tests; it + * leads to tons of unreached branches which in reality are only assertions we + * didn't hit. */ +#if defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert(a) STMT_BEGIN \ (void)(a); \ STMT_END |