From a4712dd7fab2e1e14ba27894279dc793d1944536 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 29 Jul 2020 07:51:12 +0200 Subject: [PATCH] Detect non-verbose commands in waf builds --- NEWS | 1 + bin/blhc | 2 +- t/logs/verbose-build | 5 +++++ t/tests.t | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 023548b..b579b11 100644 --- 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) +- Detect non-verbose commands in waf builds. Version 0.11 diff --git a/bin/blhc b/bin/blhc index 81d3b12..3b7f746 100755 --- 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+(.+?)$/ - 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; diff --git a/t/logs/verbose-build b/t/logs/verbose-build index 07476f5..2c9cf7b 100644 --- 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. + +[ 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 57ab3fb..a1ee8b5 100644 --- 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 +NONVERBOSE BUILD: [ 1/13] Compiling src/instance.c +NONVERBOSE BUILD: [11/13] Compiling suil.pc.in '; is_blhc 'parallel', '', 0, ''; -- 2.43.2