From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 17 Mar 2012 23:38:08 +0000 (+0100)
Subject: Also support colored non-verbose builds on armhf and hurd.
X-Git-Tag: 0.01~94
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=343ede32cc9e8ab1c683cb2ea37f414f677c95bb;p=blhc%2Fblhc.git

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

diff --git a/bin/blhc b/bin/blhc
index a884e11..0b4b681 100755
--- 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 2ae94d9..940ab77 100644
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -29,6 +29,13 @@ checking whether compiling and linking against OpenSSL works... yes
 ...
       [LD]   src/test.o
 
+# Colored build output (used on armhf and hurd).
+      [CC(B]   src/test-a.o
+      [CC(B]   src/test-b.o
+      [CC(B]   src/test_c.o
+...
+      [LD(B]   src/test.o
+
 CC modules/server/test.c
 
 Byte-compiling python modules...
diff --git a/t/tests.t b/t/tests.t
index 6ec7c69..f29ac11 100644
--- 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