Fix false positive with file names containg "cc".

For example "test.cc". Also add another non-verbose test.

diff --git a/bin/blhc b/bin/blhc
index aecc18052b83d5b06526bd492cada20739e07db6..d966f9340248c5331157568f1fe2673f852d99cb 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -242,7 +242,7 @@ while (my $line = <>) {
 
         } else {
             # Ignore lines with no compiler commands.
-            next if $line !~ /\b(cc|gcc|g\+\+|c\+\+)(\s|\\)/;
+            next if $line !~ /\b((?<!\.)cc|gcc|g\+\+|c\+\+)(\s|\\)/;
 
             # Ignore false positives.
             #

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 9dd618ff5d5c90699da68c175b05e6822bfe3189..a50057666abea3a31387df23cdd920051ceb978b 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -18,4 +18,6 @@ Byte-compiling python modules (optimized versions) ...
 Byte-compiling python modules...
 Byte-compiling python modules (optimized versions) ...
 
+Compiling test/test.cc to ../build/test/test.cc
+
 [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o

diff --git a/t/tests.t b/t/tests.t
index 4247be5fdfb707d9a6b0e6f45fd94a70c8834783..5daab16d29e319954503cae224eec735ca6ce416 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -302,6 +302,7 @@ NONVERBOSE BUILD:   CC     libtest_c.lo
 NONVERBOSE BUILD:   CC     libtest-d.lo
 NONVERBOSE BUILD:   CCLD   libtest.la
 NONVERBOSE BUILD: CC modules/server/test.c
+NONVERBOSE BUILD: Compiling test/test.cc to ../build/test/test.cc
 NONVERBOSE BUILD: [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o
 No compiler commands!
 ";