From 9de1741e00b3e475108b9b69fbf86ae30e9c2745 Mon Sep 17 00:00:00 2001
From: Stewart Smith <stewart@linux.vnet.ibm.com>
Date: Fri, 19 Dec 2014 11:45:07 +1100
Subject: Pretty print make check and coverage output

Can still get the details with V=1, just like normal make.

Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
---
 core/test/Makefile.check     | 10 +++++-----
 hw/ipmi/test/Makefile.check  |  8 ++++----
 libc/test/Makefile.check     |  8 ++++----
 libflash/test/Makefile.check | 10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/test/Makefile.check b/core/test/Makefile.check
index 15a662f..f3f35d5 100644
--- a/core/test/Makefile.check
+++ b/core/test/Makefile.check
@@ -6,21 +6,21 @@ check: $(CORE_TEST:%=%-check) $(CORE_TEST:%=%-gcov-run)
 coverage: $(CORE_TEST:%=%-gcov-run)
 
 $(CORE_TEST:%=%-gcov-run) : %-run: %
-	$<
+	$(call Q, TEST-COVERAGE ,$< , $<)
 
 $(CORE_TEST:%=%-check) : %-check: %
-	$(VALGRIND) $<
+	$(call Q, RUN-TEST ,$(VALGRIND) $<, $<)
 
 core/test/stubs.o: core/test/stubs.c
-	$(HOSTCC) $(HOSTCFLAGS) -g -c -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -g -c -o $@ $<, $<)
 
 $(CORE_TEST) : core/test/stubs.o
 
 $(CORE_TEST) : % : %.c
-	$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -I libfdt -o $@ $< core/test/stubs.o
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -I libfdt -o $@ $< core/test/stubs.o, $<)
 
 $(CORE_TEST:%=%-gcov): %-gcov : %.c %
-	$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -O0 -g -I include -I . -I libfdt -lgcov -o $@ $< core/test/stubs.o
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -O0 -g -I include -I . -I libfdt -lgcov -o $@ $< core/test/stubs.o, $<)
 
 -include $(wildcard core/test/*.d)
 
diff --git a/hw/ipmi/test/Makefile.check b/hw/ipmi/test/Makefile.check
index 59c7a9b..05fb903 100644
--- a/hw/ipmi/test/Makefile.check
+++ b/hw/ipmi/test/Makefile.check
@@ -6,16 +6,16 @@ check: $(IPMI_TEST:%=%-check) $(IPMI_TEST:%=%-gcov-run)
 coverage: $(IPMI_TEST:%=%-gcov-run)
 
 $(IPMI_TEST:%=%-gcov-run) : %-run: %
-	$<
+	$(call Q, TEST-COVERAGE ,$< , $<)
 
 $(IPMI_TEST:%=%-check) : %-check: %
-	$(VALGRIND) $<
+	$(call Q, RUN-TEST ,$(VALGRIND) $<, $<)
 
 $(IPMI_TEST) : % : %.c
-	$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -o $@ $<, $<)
 
 $(IPMI_TEST:%=%-gcov): %-gcov : %.c %
-	$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -O0 -g -I include -I . -I libfdt -lgcov -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -O0 -g -I include -I . -I libfdt -lgcov -o $@ $<, $<)
 
 $(IPMI_TEST:%=%-gcov): % : $(%.d:-gcov=)
 
diff --git a/libc/test/Makefile.check b/libc/test/Makefile.check
index 57f6cf7..18bc3b4 100644
--- a/libc/test/Makefile.check
+++ b/libc/test/Makefile.check
@@ -6,16 +6,16 @@ check: $(LIBC_TEST:%=%-check)
 coverage: $(LIBC_TEST:%=%-gcov-run)
 
 $(LIBC_TEST:%=%-gcov-run) : %-run: %
-	$<
+	$(call Q, TEST-COVERAGE ,$< , $<)
 
 $(LIBC_TEST:%=%-check) : %-check: %
-	$(VALGRIND) $<
+	$(call Q, RUN-TEST ,$(VALGRIND) $<, $<)
 
 $(LIBC_TEST) : % : %.c
-	$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -I libfdt -I libc/include -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -I libfdt -I libc/include -o $@ $<, $<)
 
 $(LIBC_TEST:%=%-gcov): %-gcov : %.c %
-	$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -lgcov -O0 -g -I include -I . -I libfdt -I libc/include -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -lgcov -O0 -g -I include -I . -I libfdt -I libc/include -o $@ $<, $<)
 
 -include $(wildcard libc/test/*.d)
 
diff --git a/libflash/test/Makefile.check b/libflash/test/Makefile.check
index d6aac3c..8385e8a 100644
--- a/libflash/test/Makefile.check
+++ b/libflash/test/Makefile.check
@@ -6,21 +6,21 @@ check: $(LIBFLASH_TEST:%=%-check) $(CORE_TEST:%=%-gcov-run)
 coverage: $(LIBFLASH_TEST:%=%-gcov-run)
 
 $(LIBFLASH_TEST:%=%-gcov-run) : %-run: %
-	$<
+	$(call Q, TEST-COVERAGE ,$< , $<)
 
 $(LIBFLASH_TEST:%=%-check) : %-check: %
-	$(VALGRIND) $<
+	$(call Q, RUN-TEST ,$(VALGRIND) $<, $<)
 
 libflash/test/stubs.o: libflash/test/stubs.c
-	$(HOSTCC) $(HOSTCFLAGS) -g -c -o $@ $<
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -g -c -o $@ $<, $<)
 
 $(LIBFLASH_TEST) : libflash/test/stubs.o libflash/libflash.c
 
 $(LIBFLASH_TEST) : % : %.c 
-	$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -o $@ $< libflash/test/stubs.o
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I include -I . -o $@ $< libflash/test/stubs.o, $<)
 
 $(LIBFLASH_TEST:%=%-gcov): %-gcov : %.c %
-	$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -lgcov -O0 -g -I include -I . -o $@ $< libflash/test/stubs.o
+	$(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -fprofile-arcs -ftest-coverage -lgcov -O0 -g -I include -I . -o $@ $< libflash/test/stubs.o, $<)
 
 -include $(wildcard libflash/test/*.d)
 
-- 
cgit v1.1