From 77130673acb919d0b1cfed6cfac6bc2338751878 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 19 Mar 2012 05:06:25 +0100 Subject: [PATCH] Detect more CXX non-verbose builds. --- bin/blhc | 2 +- t/logs/verbose-build | 9 +++++++++ t/tests.t | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/blhc b/bin/blhc index bd9ebbd..bcae721 100755 --- a/bin/blhc +++ b/bin/blhc @@ -168,7 +168,7 @@ sub is_non_verbose_build { my ($line, $next_line, $skip_ref) = @_; if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/ - or $line =~ /^\s*\[?(?:CC|CCLD|LD)\]?\s+(.+?)$/ + or $line =~ /^\s*\[?(?:CC|CCLD|CXX|CXXLD|LD)\]?\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 (.+?)$/)) { diff --git a/t/logs/verbose-build b/t/logs/verbose-build index 940ab77..b013028 100644 --- a/t/logs/verbose-build +++ b/t/logs/verbose-build @@ -16,9 +16,18 @@ checking whether compiling and linking against OpenSSL works... yes ... CCLD libtest.la + + CXX libtest-a.lo + CXX libtest-b.lo + CXX libtest_c.lo + CXX libtest-d.lo +... + CXXLD libtest.la + [CC] src/test-a.o [CC] src/test-b.o [CC] src/test_c.o + [CXX] src/test-d.o ... [LD] src/test.o diff --git a/t/tests.t b/t/tests.t index f29ac11..0cd73f4 100644 --- a/t/tests.t +++ b/t/tests.t @@ -309,9 +309,15 @@ NONVERBOSE BUILD: CC libtest-b.lo NONVERBOSE BUILD: CC libtest_c.lo NONVERBOSE BUILD: CC libtest-d.lo NONVERBOSE BUILD: CCLD libtest.la +NONVERBOSE BUILD: CXX libtest-a.lo +NONVERBOSE BUILD: CXX libtest-b.lo +NONVERBOSE BUILD: CXX libtest_c.lo +NONVERBOSE BUILD: CXX libtest-d.lo +NONVERBOSE BUILD: CXXLD libtest.la NONVERBOSE BUILD: [CC] src/test-a.o NONVERBOSE BUILD: [CC] src/test-b.o NONVERBOSE BUILD: [CC] src/test_c.o +NONVERBOSE BUILD: [CXX] src/test-d.o NONVERBOSE BUILD: [LD] src/test.o NONVERBOSE BUILD: [CC] src/test-a.o NONVERBOSE BUILD: [CC] src/test-b.o -- 2.43.2