Browse Source

Teach cov-exclude to detect runaway LCOV_EXCL_START lines

Also, fix two instances of runaway LCOV_EXCL_START lines.
Nick Mathewson 7 years ago
parent
commit
43db91bd87
3 changed files with 8 additions and 2 deletions
  1. 6 0
      scripts/test/cov-exclude
  2. 1 1
      src/common/address.c
  3. 1 1
      src/or/onion_tap.c

+ 6 - 0
scripts/test/cov-exclude

@@ -26,3 +26,9 @@ if ($excluding or $exclude_this) {
   s{^\s*\#\#+:}{        x:};
   s{^   (\s*)(\d+):}{$1!!!$2:};
 }
+
+if (eof and $excluding) {
+    warn "Runaway LCOV_EXCL_START in $ARGV";
+    $excluding = 0;
+}
+

+ 1 - 1
src/common/address.c

@@ -1198,7 +1198,7 @@ tor_addr_hash(const tor_addr_t *addr)
     /* LCOV_EXCL_START */
     tor_fragile_assert();
     return 0;
-    /* LCOV_EXCL_END */
+    /* LCOV_EXCL_STOP */
   }
 }
 

+ 1 - 1
src/or/onion_tap.c

@@ -159,7 +159,7 @@ onion_skin_TAP_server_handshake(
      * big. That should be impossible. */
     log_info(LD_GENERAL, "crypto_dh_get_public failed.");
     goto err;
-    /* LCOV_EXCP_STOP */
+    /* LCOV_EXCL_STOP */
   }
 
   key_material_len = DIGEST_LEN+key_out_len;