Also support colored non-verbose builds on armhf and hurd.

diff --git a/bin/blhc b/bin/blhc
index a884e11407188fcf0e679416e695150cbf4f4b08..0b4b681086bb009f85d9658882b49c88164dd4e4 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -288,6 +288,9 @@ while (my $line = <>) {
     # Also strip '\0xf' (delete previous character), used by Elink's build
     # system.
     $line =~ s/\x0f//g;
+    # And "ESC(B" which seems to be used on armhf and hurd (not sure what it
+    # does).
+    $line =~ s/\033\(B//g;
 
     # Check if this line indicates a non verbose build.
     my $non_verbose = is_non_verbose_build($line);

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 2ae94d987ca1ce7a6f03a2da5da24417128ccee5..940ab772fb26238fdc1de2677c6eae214c9a9364 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -29,6 +29,13 @@ checking whether compiling and linking against OpenSSL works... yes
 ...
       [\e[32mLD\e[m\ f]   src/test.o
 
+# Colored build output (used on armhf and hurd).
+      [\e[36mCC\e(B\e[m]   src/test-a.o
+      [\e[36mCC\e(B\e[m]   src/test-b.o
+      [\e[36mCC\e(B\e[m]   src/test_c.o
+...
+      [\e[32mLD\e(B\e[m]   src/test.o
+
 CC modules/server/test.c
 
 Byte-compiling python modules...

diff --git a/t/tests.t b/t/tests.t
index 6ec7c6938928aa1f6f538a84f85c9ef6e556e9f6..f29ac11011d23a4bb0e72e5aae30eb85905ddd9f 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -317,6 +317,10 @@ NONVERBOSE BUILD:       [CC]   src/test-a.o
 NONVERBOSE BUILD:       [CC]   src/test-b.o
 NONVERBOSE BUILD:       [CC]   src/test_c.o
 NONVERBOSE BUILD:       [LD]   src/test.o
+NONVERBOSE BUILD:       [CC]   src/test-a.o
+NONVERBOSE BUILD:       [CC]   src/test-b.o
+NONVERBOSE BUILD:       [CC]   src/test_c.o
+NONVERBOSE BUILD:       [LD]   src/test.o
 NONVERBOSE BUILD: CC modules/server/test.c
 NONVERBOSE BUILD: Compiling test/test.cc to ../build/test/test.o
 NONVERBOSE BUILD: Building shared library ../build/test/libtest.so.1.2.3