diff options
| author | Martin Roth <gaumless@gmail.com> | 2022-11-13 09:42:09 -0700 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-11-16 19:50:28 +0000 |
| commit | 1e0f132ff4ef1e8f8458ca79001bc37dbaeaedd8 (patch) | |
| tree | 4ffe40c13fca94e45ad427a5e7e9466d1c1fae03 | |
| parent | 24fb14a6434c2e28b156f424621f9703ae700d72 (diff) | |
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 <gaumless@gmail.com>
Change-Id: I6faa5bd5292ac5cceba9a64fe81939c0e25b9f3e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69519
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
| -rw-r--r-- | util/testing/Makefile.inc | 16 |
1 files changed, 9 insertions, 7 deletions
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 |