diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-03-19 08:02:09 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-03-19 08:02:09 -0400 |
commit | 4f596b3edfe5bcf4898bfe6007aa8e4677d2ba05 (patch) | |
tree | 2bef6228ee1b19614d6dc545b07527d1bd198523 /src | |
parent | e8f08605570ec0ec2dd5c6b224df7a534a7693c3 (diff) | |
parent | c862205ba5b9954fe9dbc22a104238a3c04951a8 (diff) | |
download | tor-4f596b3edfe5bcf4898bfe6007aa8e4677d2ba05.tar.gz tor-4f596b3edfe5bcf4898bfe6007aa8e4677d2ba05.zip |
Merge remote-tracking branch 'tor-github/pr/1807/head'
Diffstat (limited to 'src')
-rw-r--r-- | src/test/test_circuitbuild.c | 4 | ||||
-rw-r--r-- | src/test/test_dir.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index 8b506011b0..10d78abc35 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -115,8 +115,12 @@ test_new_route_len_unhandled_exit(void *arg) (void)arg; #ifdef ALL_BUGS_ARE_FATAL + /* Coverity (and maybe clang analyser) complain that the code following + * tt_skip() is unconditionally unreachable. */ +#if !defined(__COVERITY__) && !defined(__clang_analyzer__) tt_skip(); #endif +#endif MOCK(count_acceptable_nodes, mock_count_acceptable_nodes); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index e6f87dbd32..bf9a04b079 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4992,8 +4992,12 @@ test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg) (void)arg; #ifdef ALL_BUGS_ARE_FATAL + /* Coverity (and maybe clang analyser) complain that the code following + * tt_skip() is unconditionally unreachable. */ +#if !defined(__COVERITY__) && !defined(__clang_analyzer__) tt_skip(); #endif +#endif tor_capture_bugs_(1); setup_full_capture_of_logs(LOG_WARN); |