From 673716deddbd18d03db83defddea98af687f3570 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 9 Sep 2021 13:42:29 +0200 Subject: [PATCH] util/testing: Give meaningful error if intel-sec-tools aren't around Without manual handling, when 3rdparty/intel-sec-tools isn't around, `make what-jenkins-does` reports only go: go.mod file not found in current directory or any parent directory; see 'go help modules' which isn't meaningful or actionable. Instead check that the go.mod file exists and bail out with a better error message before trying to run `go mod vendor`. Change-Id: I035747746ca5fd54841bd67352044dde12a28185 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/57527 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Paul Menzel --- util/testing/Makefile.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index 4de3307b47..0b93425dde 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -85,6 +85,11 @@ ifneq ($(JENKINS_SKIP_LINT_TESTS),y) util/lint/lint lint-stable --junit util/lint/lint lint-extended --junit endif + 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 cd 3rdparty/intel-sec-tools/ ; go mod vendor util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/chromeos $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/default $(ABUILD_OPTIONS)