[Skiboot] [PATCH 2/3] make remaining noisy tests quiet

[Stewart Smith]

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 external/gard/test/Makefile.check |  6 +++---
 test/Makefile.check               | 14 +++++++-------
 test/hello_world/Makefile.check   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/external/gard/test/Makefile.check b/external/gard/test/Makefile.check
index d457361b8f58..10cb7d10468c 100644
--- a/external/gard/test/Makefile.check
+++ b/external/gard/test/Makefile.check
@@ -7,14 +7,14 @@ check: check-gard
 #architectures might be lying around and clean once done to
 #avoid the opposite
 check-gard: gard-test-clean
-	@make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ check
-	@make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ clean
+	$(call QTEST, RUN-TEST , make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ check, $@)
+	$(call QTEST, CLEANUP , make CC=$(HOSTCC) CROSS='' CROSS_COMPILE='' -C external/gard/ clean, $@)
 
 .PHONY: check-gard
 
 clean: gard-test-clean
 
 gard-test-clean:
-	@make -C external/gard clean
+	$(call QTEST, CLEANUP , make -C external/gard clean, $@)
 
 .PHONY: gard-test-clean
diff --git a/test/Makefile.check b/test/Makefile.check
index a361e7fc037d..db286ac1cb5f 100644
--- a/test/Makefile.check
+++ b/test/Makefile.check
@@ -1,29 +1,29 @@
 check: boot-check boot-smt-check qemu-boot-check debian-jessie-boot-check
 
 boot-check: skiboot.lid
-	./test/run_mambo_boot_test.sh
+	$(call Q, BOOT TEST , ./test/run_mambo_boot_test.sh, $@)
 
 boot-smt-check: skiboot.lid
-	THREADS=2 ./test/run_mambo_boot_test.sh
+	$(call Q, BOOT TEST , THREADS=2 ./test/run_mambo_boot_test.sh, $@)
 
 qemu-boot-check: skiboot.lid
-	./test/run_qemu_boot_test.sh
+	$(call Q, BOOT TEST , ./test/run_qemu_boot_test.sh , $@)
 
 debian-jessie-boot-check: skiboot.lid
-	./test/run_qemu-jessie-debian-installer_boot_test.sh
+	$(call Q, BOOT TEST , ./test/run_qemu-jessie-debian-installer_boot_test.sh, $@)
 
 OP_BUILD_BOOT_CHECK=op-build-v1.0 op-build-v1.1 op-build-v1.2 op-build-v1.2.1
 
 boot-check-%: skiboot.lid skiboot.map
-	SKIBOOT_MEM_DUMP=skiboot-$(@:boot-check-%=%).dump SKIBOOT_ZIMAGE=`pwd`/opal-ci/images/$(@:boot-check-%=%)/zImage.epapr ./test/run_mambo_boot_test.sh
+	$(call Q, BOOT TEST , SKIBOOT_MEM_DUMP=skiboot-$(@:boot-check-%=%).dump SKIBOOT_ZIMAGE=`pwd`/opal-ci/images/$(@:boot-check-%=%)/zImage.epapr ./test/run_mambo_boot_test.sh, $@)
 
 boot-tests: boot-check $(OP_BUILD_BOOT_CHECK:%=boot-check-%)
 
 boot-coverage-report: boot-tests extract-gcov skiboot.map all-boot-hardware
-	CROSS=$(CROSS) BOOT_TESTS="hello_world boot_test ${OP_BUILD_BOOT_CHECK} ${FSP_GCOV_MACHINES}" ./test/make-boot-coverage-report.sh
+	$(call Q, BOOT TEST , CROSS=$(CROSS) BOOT_TESTS="hello_world boot_test ${OP_BUILD_BOOT_CHECK} ${FSP_GCOV_MACHINES}" ./test/make-boot-coverage-report.sh, $@)
 
 boot-fsp-hardware-%: skiboot.lid skiboot.map
-	./external/boot-tests/boot_test.sh -v -p -b fsp -t $(@:boot-fsp-hardware-%=%) -1 skiboot.lid
+	$(call Q, BOOT TEST , ./external/boot-tests/boot_test.sh -v -p -b fsp -t $(@:boot-fsp-hardware-%=%) -1 skiboot.lid, $@)
 	./external/boot-tests/extract_gcov.sh $(@:boot-fsp-hardware-%=%)
 
 all-boot-hardware: $(FSP_GCOV_MACHINES:%=boot-fsp-hardware-%)
diff --git a/test/hello_world/Makefile.check b/test/hello_world/Makefile.check
index ee813f178678..5633c195cace 100644
--- a/test/hello_world/Makefile.check
+++ b/test/hello_world/Makefile.check
@@ -9,13 +9,13 @@ boot-tests: hello_world-tests
 check: hello_world-tests
 
 $(HELLO_WORLD_TEST:%=%-check-smt-mambo): %-check-smt-mambo: % skiboot.lid
-	THREADS=2 ./test/hello_world/run_mambo_hello_world.sh
+	$(call Q , BOOT TEST , THREADS=2 ./test/hello_world/run_mambo_hello_world.sh , $@)
 
 $(HELLO_WORLD_TEST:%=%-check-mambo): %-check-mambo: % skiboot.lid
-	./test/hello_world/run_mambo_hello_world.sh
+	$(call Q , BOOT TEST , ./test/hello_world/run_mambo_hello_world.sh, $@)
 
 $(HELLO_WORLD_TEST:%=%-check-qemu): %-check-qemu: % skiboot.lid
-	./test/hello_world/run_qemu_hello_world.sh
+	$(call Q , BOOT TEST , ./test/hello_world/run_qemu_hello_world.sh, $@)
 
 test/hello_world/hello_kernel/hello_kernel.o: test/hello_world/hello_kernel/hello_kernel.S test/hello_world/hello_kernel/hello_kernel.ld
 	$(call Q,CC, $(CC) -m64 -c -MMD -o $@ $< ,$@)
-- 
2.1.4