Support verbose builds which use "Compiling filename...".

diff --git a/bin/blhc b/bin/blhc
index f5fbfb8f3250d3843b4e61d714dfd475c57c7f4d..585df64686548a44b699b8a8abbd8221ef449ffb 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -117,7 +117,7 @@ sub is_non_verbose_build {
 
     if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
                 or $line =~ /^\s*(?:CC|CCLD)\s+(.+?)$/
-                or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)$/
+                or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/
                 or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/
                 or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
         return 0;

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 18c31931b0f424f2fdef40efb64b7f43e6116a12..aba204b83326bd38b7c0b443f54d1eb6244d3df1 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -38,6 +38,12 @@ g++ -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Wer
 Building program ../build/bin/test
 g++ ../build/obj/test/test.o -o /../build/bin/test
 
+# Non verbose.
+Compiling test_file.cxx...
+# Verbose ...
+Compiling test_file.cxx...
+g++ -g -O2 -fPIC --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test_file.cxx
+
 # Non verbose.
 [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o
 [ 82%] Building C object src/CMakeFiles/test/test.c.o

diff --git a/t/tests.t b/t/tests.t
index ad30e5b9c8f88c7dc7f39416c5aa37743f454c53..35df8353e29f14d787d25988ce2abecd557d0997 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -316,6 +316,8 @@ LDFLAGS missing (-Wl,-z,relro): g++ -fPIC -DPIC \            -o ../build/test/li
 CFLAGS missing (-Wformat): g++ -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -o ../build/test/test.o test.cc
 CPPFLAGS missing (-D_FORTIFY_SOURCE=2): g++ -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -o ../build/test/test.o test.cc
 LDFLAGS missing (-Wl,-z,relro): g++ ../build/obj/test/test.o -o /../build/bin/test
+NONVERBOSE BUILD: Compiling test_file.cxx...
+CFLAGS missing (-fstack-protector): g++ -g -O2 -fPIC --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test_file.cxx
 NONVERBOSE BUILD: [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o
 NONVERBOSE BUILD: [ 82%] Building C object src/CMakeFiles/test/test.c.o
 CFLAGS missing (-Wformat): cd /tmp/test/src && /usr/bin/c++ -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Werror=format-security -o CMakeFiles/test-verbose.dir/verbose.cpp.o -c -D_FORTIFY_SOURCE=2 /tmp/test/src/test-verbose/verbose.cpp