tor

commit 4f596b3edfe5bcf4898bfe6007aa8e4677d2ba05
parent e8f08605570ec0ec2dd5c6b224df7a534a7693c3
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 19 Mar 2020 08:02:09 -0400

Merge remote-tracking branch 'tor-github/pr/1807/head'

Diffstat:
M
src/test/test_circuitbuild.c
 | 
4
++++
M
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
@@ -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
@@ -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);