From 0a47fe3860b5c7aecbb60760010b69a28ef460ff Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Fri, 16 Mar 2012 18:18:07 +0100 Subject: [PATCH] Support verbose builds which use "Compiling filename...". --- bin/blhc | 2 +- t/logs/verbose-build | 6 ++++++ t/tests.t | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/blhc b/bin/blhc index f5fbfb8..585df64 100755 --- 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 18c3193..aba204b 100644 --- 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 ad30e5b..35df835 100644 --- 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 -- 2.43.2