summaryrefslogtreecommitdiff
path: root/Makefile.inc
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-10-12 14:40:26 -0600
committerMartin Roth <martinroth@google.com>2016-12-12 17:45:41 +0100
commit8d49d52ae930de51633c6533f61a710235399dad (patch)
tree64716df4b5174070088c58cd53fb8402b8c3217e /Makefile.inc
parent9fdb41ab9a60c59d1c3ae727da7247f1de46c9d3 (diff)
downloadcoreboot-8d49d52ae930de51633c6533f61a710235399dad.tar.xz
Makefile.inc: Update what-jenkins-does target
- Update the junit.xml target to make it less util specific - Add builds of coreboot internal payloads: nvramcui and coreinfo Change-Id: I97fda909065659ab7fa4c8ee00d936d97b255bf7 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/17014 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc20
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.inc b/Makefile.inc
index a1931584a4..c5ce30f2b1 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1019,18 +1019,18 @@ PHONY+=check-ramstage-overlaps
endif
junit.xml:
- echo "Building $(UTIL)"
+ echo "Building $(BLD)"
echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp
- echo "<testcase classname='$(UTIL)' name='$(UTIL)'>" >> $@.tmp
- -$(MAKE) -j $(CPUS) -C "util/$(UTIL)" clean distclean > $@.tmp.2 2>&1
- $(MAKE) -j $(CPUS) -C "util/$(UTIL)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
+ echo "<testcase classname='$(BLD)' name='$(BLD)'>" >> $@.tmp
+ -$(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" clean distclean > $@.tmp.2 2>&1
+ $(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
cat $@.tmp.2; \
if [ "$$type" = "failure" ]; then \
echo "<failure type='buildFailed'>" >> $@.tmp; \
- echo "Building $(UTIL) Failed"; \
+ echo "Building $(BLD) Failed"; \
else \
echo "<$$type>" >> $@.tmp; \
- echo "Building $(UTIL) Succeeded"; \
+ echo "Building $(BLD) Succeeded"; \
fi; \
echo '<![CDATA[' >> $@.tmp; \
cat $@.tmp.2 >> $@.tmp; \
@@ -1038,7 +1038,7 @@ junit.xml:
rm -f $@.tmp.2
echo "</testcase>" >> $@.tmp
echo "</testsuite>" >> $@.tmp
- mv $@.tmp "util/$(UTIL)/$@"
+ mv $@.tmp "$(BLD_DIR)$(BLD)/$@"
echo
TOOLLIST= \
@@ -1057,5 +1057,7 @@ what-jenkins-does:
util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml
util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD)
(cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml)
- $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; )
- $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) UTIL="romcc" MFLAGS= MAKEFLAGS= MAKETARGET=test junit.xml
+ $(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/ BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; )
+ $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/ BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml
+ $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/ BLD=coreinfo MFLAGS= MAKEFLAGS= MAKETARGET=defaultbuild junit.xml
+ $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/ BLD=romcc MFLAGS= MAKEFLAGS= MAKETARGET=test junit.xml