From 536bb0bebcc02094cf3b7ee66fb89ee83e6e1267 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 20 Aug 2023 11:19:27 -0600 Subject: util/testing: Separate ccache option from abuild options scanbuild and ccache don't work together, so separate ccache from the rest of the abuild options. All of the other tests get ccache, but scanbuild never does. Signed-off-by: Martin Roth Change-Id: If057ed20c687ac8b501d20c6b4af91f8c0ab84b7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/77326 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Eric Lai --- util/testing/Makefile.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'util') diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index ff55df059b..0e4cad60da 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -78,9 +78,10 @@ lint lint-stable lint-extended: ABUILD_OPTIONS=--blobs --junit --cpus $(CPUS) --payloads $(JENKINS_PAYLOAD) ABUILD_OPTIONS+=$(if $(V),--verbose,) -ABUILD_OPTIONS+=$(if $(JENKINS_NOCCACHE),,--ccache) ABUILD_OPTIONS+=$(JENKINS_ABUILD_OPT) +CCACHE_OPTIONS=$(if $(JENKINS_NOCCACHE),,--ccache) + COREBOOT_BUILD_DIR?=coreboot-builds validate_sec_tools: @@ -119,12 +120,12 @@ ifneq ($(JENKINS_SKIP_SCANBUILD_TEST),y) NAME=scanbuild; SCANBUILD_ARGS='-k -plist-html -maxloop 10' util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) -scan-build --target EMULATION_QEMU_X86_Q35 --exitcode --name $${NAME} endif ifneq ($(JENKINS_SKIP_GCC_TESTS),y) - NAME=gcc-chromeos; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) -x --name $${NAME} --clean - NAME=gcc; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) --name $${NAME} --clean-somewhat + NAME=gcc-chromeos; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) $(CCACHE_OPTIONS) -x --name $${NAME} --clean + NAME=gcc; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) $(CCACHE_OPTIONS) --name $${NAME} --clean-somewhat endif ifneq ($(JENKINS_SKIP_CLANG_TESTS),y) - NAME=clang-chromeos; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) -L -x --name $${NAME} --clean - NAME=clang; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) -L --name $${NAME} --clean + NAME=clang-chromeos; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) $(CCACHE_OPTIONS) -L -x --name $${NAME} --clean + NAME=clang; util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/$${NAME} $(ABUILD_OPTIONS) $(CCACHE_OPTIONS) -L --name $${NAME} --clean endif test-payloads: -- cgit v1.2.3