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>
This commit is contained in:
Martin Roth 2022-11-13 09:42:09 -07:00 committed by Martin L Roth
parent 24fb14a643
commit 1e0f132ff4
1 changed files with 9 additions and 7 deletions

View File

@ -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