diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2019-07-25 12:24:32 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-07-26 11:06:22 +0000 |
| commit | c199973f78b6284d78cc2eb79d78470a15c0350b (patch) | |
| tree | 7d43f9c11ba5bbbad7d5b9c67100b2754578f89b | |
| parent | ccab651ded76308e86596ab1da7616a7935e7d95 (diff) | |
util/testing: Factor out abuild options in what-jenkins-does
The abuild command line can vary a lot depending on options and the line
became unwieldy (plus, it's on two lines because we run abuild twice),
so factor it out into a variable.
Change-Id: I102756fb95c93f542d534610bf9737a13ac1ad62
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34566
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Jacob Garber <jgarber1@ualberta.ca>
| -rw-r--r-- | util/testing/Makefile.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index 80e29efc83..6315af226d 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -80,11 +80,15 @@ CPUS?=4 lint lint-stable lint-extended: util/lint/lint $@ +ABUILD_OPTIONS=-B -J -c $(CPUS) -z -p $(JENKINS_PAYLOAD) +ABUILD_OPTIONS+=$(if $(V),-v,) +ABUILD_OPTIONS+=$(if $(JENKINS_NOCCACHE),,-y) + what-jenkins-does: util/lint/lint lint-stable --junit util/lint/lint lint-extended --junit - util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml - util/abuild/abuild -B -J $(if $(V),-v,) $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) + util/abuild/abuild $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml + util/abuild/abuild $(ABUILD_OPTIONS) $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR="util/$(tool)" BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; ) unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/nvramcui BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml unset COREBOOT_BUILD_DIR;$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/coreinfo BLD=coreinfo MFLAGS= MAKEFLAGS= MAKETARGET=defaultbuild junit.xml |