diff options
author | Oliver O'Halloran <oohall@gmail.com> | 2020-06-12 12:24:49 +1000 |
---|---|---|
committer | Oliver O'Halloran <oohall@gmail.com> | 2020-06-17 21:18:45 +1000 |
commit | 028442e6573eabbc2ebc6499f92fcf5ace856553 (patch) | |
tree | 00342fd86d7d2be71d343e5b6d468aa15473e844 | |
parent | 09b4be2c46214746149f9f11f235a3ae0c6b16cc (diff) | |
download | skiboot-028442e6573eabbc2ebc6499f92fcf5ace856553.zip skiboot-028442e6573eabbc2ebc6499f92fcf5ace856553.tar.gz skiboot-028442e6573eabbc2ebc6499f92fcf5ace856553.tar.bz2 |
test: Do gcov builds as a seperate pass
We only really use the gcov output when doing the coverage report as a
part of the "docs" CI builds. It's useful for development to just run
the unit tests so make sure the "check" and "coverage" targets are
seperate.
This also speeds up our CI builds since those jobs are already doing a
seperate GCOV pass so building and running the GCOV binaries during the
check pass is redundant.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rw-r--r-- | ccan/Makefile.check | 5 | ||||
-rw-r--r-- | core/test/Makefile.check | 3 | ||||
-rw-r--r-- | hw/ipmi/test/Makefile.check | 2 | ||||
-rw-r--r-- | libflash/test/Makefile.check | 2 | ||||
-rw-r--r-- | libstb/secvar/test/Makefile.check | 6 | ||||
-rw-r--r-- | libstb/test/Makefile.check | 4 |
6 files changed, 9 insertions, 13 deletions
diff --git a/ccan/Makefile.check b/ccan/Makefile.check index a596766..e9c2397 100644 --- a/ccan/Makefile.check +++ b/ccan/Makefile.check @@ -4,12 +4,11 @@ LCOV_EXCLUDE += $(CCAN_TEST_SRC) ccan/list/test/helper.c CCAN_TEST := $(CCAN_TEST_SRC:%.c=%) - -.PHONY: $(CCAN_TEST:%=%-gcov-run) ccan-check +.PHONY: ccan-check ccan-check: $(CCAN_TEST:%=%-check) -check: ccan-check $(CCAN_TEST:%=%-gcov-run) +check: ccan-check .PHONY: ccan-coverage diff --git a/core/test/Makefile.check b/core/test/Makefile.check index 8e59ef0..7c347be 100644 --- a/core/test/Makefile.check +++ b/core/test/Makefile.check @@ -35,8 +35,7 @@ LCOV_EXCLUDE += $(CORE_TEST:%=%.c) core/test/stubs.c LCOV_EXCLUDE += $(CORE_TEST_NOSTUB:%=%.c) /usr/include/* .PHONY : core-check -core-check: $(CORE_TEST:%=%-check) $(CORE_TEST:%=%-gcov-run) -core-check: $(CORE_TEST_NOSTUB:%=%-check) $(CORE_TEST_NOSTUB:%=%-gcov-run) +core-check: $(CORE_TEST:%=%-check) $(CORE_TEST_NOSTUB:%=%-check) .PHONY : core-coverage core-coverage: $(CORE_TEST:%=%-gcov-run) diff --git a/hw/ipmi/test/Makefile.check b/hw/ipmi/test/Makefile.check index c3d6359..ceed1ed 100644 --- a/hw/ipmi/test/Makefile.check +++ b/hw/ipmi/test/Makefile.check @@ -4,7 +4,7 @@ IPMI_TEST := hw/ipmi/test/run-fru LCOV_EXCLUDE += $(IPMI_TEST:%=%.c) .PHONY : hw-ipmi-check hw-ipmi-coverage -hw-ipmi-check: $(IPMI_TEST:%=%-check) $(IPMI_TEST:%=%-gcov-run) +hw-ipmi-check: $(IPMI_TEST:%=%-check) hw-ipmi-coverage: $(IPMI_TEST:%=%-gcov-run) check: hw-ipmi-check diff --git a/libflash/test/Makefile.check b/libflash/test/Makefile.check index 1e55237..4dbd7ee 100644 --- a/libflash/test/Makefile.check +++ b/libflash/test/Makefile.check @@ -33,7 +33,7 @@ check_PROGRAMS = \ TEST_FLAGS = -D__TEST__ -MMD -MP .PHONY: libflash-check libflash-coverage -libflash-check: $(check_PROGRAMS:%=%-check) $(CORE_TEST:%=%-gcov-run) +libflash-check: $(check_PROGRAMS:%=%-check) libflash-coverage: $(check_PROGRAMS:%=%-gcov-run) clean: libflash-test-clean check: libflash-check diff --git a/libstb/secvar/test/Makefile.check b/libstb/secvar/test/Makefile.check index b41eaf4..bba1197 100644 --- a/libstb/secvar/test/Makefile.check +++ b/libstb/secvar/test/Makefile.check @@ -8,12 +8,10 @@ SECVAR_TEST = $(patsubst %.c, %, $(wildcard $(SECVAR_TEST_DIR)/secvar-test-*.c)) HOSTCFLAGS+=-I . -I include .PHONY : secvar-check -secvar-check: $(SECVAR_TEST:%=%-check) $(SECVAR_TEST:%=%-gcov-run) -secvar-check: $(SECVAR_TEST_NOSTUB:%=%-check) $(SECVAR_TEST_NOSTUB:%=%-gcov-run) +secvar-check: $(SECVAR_TEST:%=%-check) $(SECVAR_TEST_NOSTUB:%=%-check) .PHONY : secvar-coverage -secvar-coverage: $(SECVAR_TEST:%=%-gcov-run) -secvar-coverage: $(SECVAR_TEST_NOSTUB:%=%-gcov-run) +secvar-coverage: $(SECVAR_TEST:%=%-gcov-run) $(SECVAR_TEST_NOSTUB:%=%-gcov-run) check: secvar-check coverage: secvar-coverage diff --git a/libstb/test/Makefile.check b/libstb/test/Makefile.check index d4d7cb4..6911e0a 100644 --- a/libstb/test/Makefile.check +++ b/libstb/test/Makefile.check @@ -9,8 +9,8 @@ libstb/test/print-stb-container-q: libstb/print-container $(call Q, TEST , $(VALGRIND) libstb/print-container -I libstb/test/t.container |diff -u libstb/test/t.container.out -, $< t.container) .PHONY : libstb-check -libstb-check: $(LIBSTB_TEST:%=%-check) $(LIBSTB_TEST:%=%-gcov-run) libstb/test/print-stb-container-check -libstb-check: $(LIBSTB_TEST_NOSTUB:%=%-check) $(LIBSTB_TEST_NOSTUB:%=%-gcov-run) +libstb-check: $(LIBSTB_TEST:%=%-check) libstb/test/print-stb-container-check +libstb-check: $(LIBSTB_TEST_NOSTUB:%=%-check) .PHONY : libstb-coverage libstb-coverage: $(LIBSTB_TEST:%=%-gcov-run) |