[tor-commits] [tor/master] Teach cov-exclude to detect runaway LCOV_EXCL_START lines

[nickm at torproject.org]

commit 43db91bd87a6f197a93285a87df473616cc1f6c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 25 10:59:19 2017 -0400

    Teach cov-exclude to detect runaway LCOV_EXCL_START lines
    
    Also, fix two instances of runaway LCOV_EXCL_START lines.
---
 scripts/test/cov-exclude | 6 ++++++
 src/common/address.c     | 2 +-
 src/or/onion_tap.c       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/test/cov-exclude b/scripts/test/cov-exclude
index 5117f11..5cb9b12 100755
--- a/scripts/test/cov-exclude
+++ b/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;
+}
+
diff --git a/src/common/address.c b/src/common/address.c
index 701daac..c5d0e91 100644
--- a/src/common/address.c
+++ b/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 */
   }
 }
 
diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c
index 9a65fcf..294fc0d 100644
--- a/src/or/onion_tap.c
+++ b/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;