From 1e0f132ff4ef1e8f8458ca79001bc37dbaeaedd8 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 13 Nov 2022 09:42:09 -0700 Subject: util/testing: Move check of intel-sec-tool to separate target Testing for the presence of intel-sec-tools doesn't need to happen inside the what-jenkins-does target. Signed-off-by: Martin Roth Change-Id: I6faa5bd5292ac5cceba9a64fe81939c0e25b9f3e Reviewed-on: https://review.coreboot.org/c/coreboot/+/69519 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- util/testing/Makefile.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'util/testing') diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index dc135fbde3..1a347983a3 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -81,18 +81,20 @@ ABUILD_OPTIONS+=$(JENKINS_ABUILD_OPT) COREBOOT_BUILD_DIR?=coreboot-builds -what-jenkins-does: - rm -rf $(COREBOOT_BUILD_DIR)/chromeos $(COREBOOT_BUILD_DIR)/default - rm -rf $(COREBOOT_BUILD_DIR)/chromeos-clang $(COREBOOT_BUILD_DIR)/default-clang -ifneq ($(JENKINS_SKIP_LINT_TESTS),y) - util/lint/lint lint-stable --junit - util/lint/lint lint-extended --junit -endif +validate_sec_tools: if [ ! -f 3rdparty/intel-sec-tools/go.mod ]; then \ echo "Please download 3rdparty/intel-sec-tools/:"; \ echo "git submodule update --init 3rdparty/intel-sec-tools"; \ exit 1; \ fi + +what-jenkins-does: validate_sec_tools + rm -rf $(COREBOOT_BUILD_DIR)/chromeos $(COREBOOT_BUILD_DIR)/default + rm -rf $(COREBOOT_BUILD_DIR)/chromeos-clang $(COREBOOT_BUILD_DIR)/default-clang +ifneq ($(JENKINS_SKIP_UNIT_TESTS),y) + util/lint/lint lint-stable --junit + util/lint/lint lint-extended --junit +endif cd 3rdparty/intel-sec-tools/ ; go mod vendor cd util/goswid ; go mod vendor util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/chromeos $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml -- cgit v1.2.3