Correctly detect verbose CMake builds.

diff --git a/bin/blhc b/bin/blhc
index 6fb0f21b491ebbd7b4cb4592ea82416e60bcc64d..813936890b9369de332a6a9648bff06c6e9a05ba 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -44,7 +44,7 @@ sub error_flags {
            error_color($message, 'red'), $flags, error_color(':', 'yellow'),
            $line;
 }
-sub error_nonverbose_build {
+sub error_non_verbose_build {
     my ($line) = @_;
 
     printf "%s%s %s",
@@ -112,12 +112,48 @@ sub pic_pie_conflict {
     return scalar @result == 0;
 }
 
+sub is_non_verbose_build {
+    my ($line, $next_line, $cc_regex, $skip_ref) = @_;
+
+    my $cmake_non_verbose = qr/^\s*\[[\d ]+%\] Building (C|CXX) object (.+?)$/;
+    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 =~ /$cmake_non_verbose/)) {
+        return 0;
+    }
+
+    # On the first pass we only check if this line is verbose or not.
+    return 1 if not defined $next_line;
+
+    # Second pass, we have access to the next line.
+    ${$skip_ref} = 0;
+
+    # CMake prints the non-verbose messages also when building verbose. If a
+    # compiler and the file name occurs in the next line, treat it as verbose
+    # build.
+    if ($line =~ /$cmake_non_verbose/) {
+        # Get filename, we can't use the complete path as only parts of it are
+        # used in the real compiler command ...
+        $2 =~ m{/([a-zA-Z0-9._-]+)$};
+        my $file = $1;
+
+        if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/) {
+            # We still have to skip the current line as it doesn't contain any
+            # compiler commands.
+            ${$skip_ref} = 1;
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
 
 # CONSTANTS/VARIABLES
 
 # Regex to catch compiler commands.
 my $cc_regex = qr/((?<!\.)cc|(x86_64-linux-gnu-)?gcc|g\+\+|c\+\+)/;
-
 # Regex to catch (GCC) compiler warnings.
 my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
 
@@ -217,15 +253,8 @@ while (my $line = <>) {
     # Ignore compiler warnings for now.
     next if $line =~ /$warning_regex/;
 
-    # Try to detect non verbose build logs.
-    if ($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*\[[\d ]+%\] Building /) {
-        error_nonverbose_build($line);
-        $exit |= 1 << 2;
-    }
-
+    # Check if this line indicates a non verbose build.
+    my $non_verbose = is_non_verbose_build($line);
 
     # One line may contain multiple commands (";"). Treat each one as single
     # line.
@@ -245,14 +274,12 @@ while (my $line = <>) {
 
         } else {
             # Ignore lines with no compiler commands.
-            next if $line !~ /\b$cc_regex(\s|\\)/;
+            next if $line !~ /\b$cc_regex(\s|\\)/ and not $non_verbose;
 
             # Ignore false positives.
             #
             # `./configure` output.
-            if ($line =~ /^checking /) {
-                next;
-            }
+            next if not $non_verbose and $line =~ /^checking /;
 
             push @input, $line;
         }
@@ -285,7 +312,18 @@ if ($bindnow) {
     @ldflags = (@ldflags, @ldflags_bindnow);
 }
 
-foreach my $line (@input) {
+for (my $i = 0; $i < scalar @input; $i++) {
+    my $line = $input[$i];
+
+    my $skip = 0;
+    if (is_non_verbose_build($line, $input[$i + 1], $cc_regex, \$skip)) {
+        error_non_verbose_build($line);
+        $exit |= 1 << 2;
+        next;
+    }
+    # Even if it's a verbose build, we might have to skip this line.
+    next if $skip;
+
     # Ignore false positives.
     #
     # ./configure summary.

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index a50057666abea3a31387df23cdd920051ceb978b..d75cdde24ca6221074d766cca39e03ab3c820f5e 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -20,4 +20,11 @@ Byte-compiling python modules (optimized versions) ...
 
 Compiling test/test.cc to ../build/test/test.cc
 
+# Non verbose.
 [ 22%] Building CXX object src/CMakeFiles/test/test.cpp.o
+[ 82%] Building C object src/CMakeFiles/test/test.c.o
+# Verbose ...
+[ 45%] Building CXX object src/CMakeFiles/test-verbose.dir/verbose.cpp.o
+cd /tmp/test/src && /usr/bin/c++ -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -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
+[ 83%] Building C object src/CMakeFiles/test-verbose-c.dir/verbose-c.c.o
+cd /tmp/test/src && /usr/bin/gcc -g -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -o CMakeFiles/test-verbose-c.dir/verbose-c.c.o -c -D_FORTIFY_SOURCE=2 /tmp/test/src/test-verbose-c/verbose-c.c

diff --git a/t/tests.t b/t/tests.t
index 5daab16d29e319954503cae224eec735ca6ce416..76dc7dafb8440b35989f00c593e6ef259c47ad04 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -294,7 +294,7 @@ LDFLAGS missing (-Wl,-z,relro -Wl,-z,now): /usr/bin/g++ -shared -fpic -o libtest
 
 # check the build log is verbose
 
-is_blhc 'verbose-build', '', 5,
+is_blhc 'verbose-build', '', 4,
         "NONVERBOSE BUILD: checking if you want to see long compiling messages... no
 NONVERBOSE BUILD:   CC     libtest-a.lo
 NONVERBOSE BUILD:   CC     libtest-b.lo
@@ -304,7 +304,7 @@ 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!
+NONVERBOSE BUILD: [ 82%] Building C object src/CMakeFiles/test/test.c.o
 ";