Detect non-verbose commands in waf builds

diff --git a/NEWS b/NEWS
index 023548b1ee4e07aafda52d2c42d2f8a1eafa8c90..b579b119f2a9e3c0010725419f93444c03541a4d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Version 0.XX
 - Fix false positive for meson build; reported by Yangfl (Debian Bug #953335).
 - Fix false positive with embedded gcc -print-* commands; reported by Andreas
   Beckmann (Debian Bug #964160)
 - Fix false positive for meson build; reported by Yangfl (Debian Bug #953335).
 - Fix false positive with embedded gcc -print-* commands; reported by Andreas
   Beckmann (Debian Bug #964160)

+- Detect non-verbose commands in waf builds.

 
 
 Version 0.11
 
 
 Version 0.11

diff --git a/bin/blhc b/bin/blhc
index 81d3b1237aee9eb6a961c050ec2b6a3a95c522bc..3b7f746113c319484b10f900f7c1fa50228d8e29 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -532,7 +532,7 @@ sub is_non_verbose_build {
 
     if (not (index($line, 'checking if you want to see long compiling messages... no') == 0
                 or $line =~ /^\s*\[?(?:CC|CCLD|C\+\+|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/
 
     if (not (index($line, 'checking if you want to see long compiling messages... no') == 0
                 or $line =~ /^\s*\[?(?:CC|CCLD|C\+\+|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/

-                or $line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/
+                or $line =~ /^\s*[][\/0-9 ]*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/

                 or $line =~ /^\s*[Bb]uilding (?:program|shared library)\s+(.+?)$/
                 or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
         return 0;
                 or $line =~ /^\s*[Bb]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 07476f5d468f3c2edec15f18e232ba056891bfe1..2c9cf7b0d9f0c9675d09b23643f2286114f70117 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -180,3 +180,8 @@ cd /build/scribus-1.4.5+dfsg1/obj-x86_64-linux-gnu/scribus/desaxe && /usr/lib/cc
 compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 Compiling pyzoltan/core/carray.pyx because it changed.
 compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 Compiling pyzoltan/core/carray.pyx because it changed.

+
+[ 1/13] Compiling src/instance.c
+08:17:31 runner ['/usr/lib/ccache/gcc', '-I/build/suil-0.10.4', '-g', '-O2', '-fdebug-prefix-map=/build/suil-0.10.4=.', '-fstack-protector-strong', '-Wformat', '-Werror=format-security', '-DNDEBUG', '-pedantic', '-Wshadow', '-Wall', '-Wcast-align', '-Wextra', '-Wmissing-declarations', '-Wno-unused-parameter', '-Wno-parentheses', '-Wstrict-overflow', '-Wundef', '-Wwrite-strings', '-fstrict-overflow', '-Wlogical-op', '-Wsuggest-attribute=noreturn', '-Wunsafe-loop-optimizations', '-fshow-column', '-std=c99', '-fvisibility=hidden', '-fPIC', '-I.', '-I..', '-I/build/suil-0.10.4/build', '-DSUIL_VERSION="0.10.4"', '-DHAVE_LV2=1', '-DHAVE_X11=1', '-DHAVE_GTK3=1', '-DHAVE_GTK3_X11=1', '-DHAVE_QT5=1', '-DHAVE_LIBDL=1', '-DSUIL_MODULE_DIR="/usr/lib/x86_64-linux-gnu/suil-0"', '-DSUIL_DIR_SEP="/"', '-DSUIL_GTK2_LIB_NAME="libgtk-x11-2.0.so.0"', '-DSUIL_GTK3_LIB_NAME="libgtk-x11-3.0.so.0"', '-DSUIL_WITH_X11_IN_GTK3=1', '-DSUIL_WITH_QT5_IN_GTK3=1', '-DSUIL_WITH_X11_IN_QT5=1', '-DSUIL_WITH_X11=1', '-DSUIL_MODULE_PREFIX="lib"', '-DSUIL_MODULE_EXT=".so"', '-DSUIL_SHARED', '-DSUIL_INTERNAL', '../src/instance.c', '-c', '-o/build/suil-0.10.4/build/src/instance.c.3.o', '-Wdate-time', '-D_FORTIFY_SOURCE=2']
+[11/13] Compiling suil.pc.in
+[12/13] Linking build/libsuil_x11.so

diff --git a/t/tests.t b/t/tests.t
index 57ab3fba0498f353ca9d0c9598381950aedf818d..a1ee8b5b9386661ab9f1cf868b55708816723aff 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -648,6 +648,8 @@ CXXFLAGS missing (-Wformat): cd /tmp/test/src && /usr/bin/c++ -g -O2 -fstack-pro
 CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-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
 NONVERBOSE BUILD: Compiling test.c \     gcc test.c
 NONVERBOSE BUILD: [  3%] Building CXX object scribus/text/CMakeFiles/scribus_text_lib.dir/frect.cpp.o
 CFLAGS missing (-Werror=format-security): cd /tmp/test/src && /usr/bin/gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-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
 NONVERBOSE BUILD: Compiling test.c \     gcc test.c
 NONVERBOSE BUILD: [  3%] Building CXX object scribus/text/CMakeFiles/scribus_text_lib.dir/frect.cpp.o

+NONVERBOSE BUILD: [ 1/13] Compiling src/instance.c
+NONVERBOSE BUILD: [11/13] Compiling suil.pc.in

 ';
 
 is_blhc 'parallel', '', 0, '';
 ';
 
 is_blhc 'parallel', '', 0, '';