GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2016-10-12 14:40:26 -06:00
parent 9fdb41ab9a
commit 8d49d52ae9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.inc
View File

@ -1019,18 +1019,18 @@ PHONY+=check-ramstage-overlaps
endif endif
junit.xml: junit.xml:
echo "Building $(UTIL)" echo "Building $(BLD)"
echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp
echo "<testcase classname='$(UTIL)' name='$(UTIL)'>" >> $@.tmp echo "<testcase classname='$(BLD)' name='$(BLD)'>" >> $@.tmp
-$(MAKE) -j $(CPUS) -C "util/$(UTIL)" clean distclean > $@.tmp.2 2>&1 -$(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" clean distclean > $@.tmp.2 2>&1
$(MAKE) -j $(CPUS) -C "util/$(UTIL)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \ $(MAKE) -j $(CPUS) -C "$(BLD_DIR)$(BLD)" $(MAKETARGET) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
cat $@.tmp.2; \ cat $@.tmp.2; \
if [ "$$type" = "failure" ]; then \ if [ "$$type" = "failure" ]; then \
echo "<failure type='buildFailed'>" >> $@.tmp; \ echo "<failure type='buildFailed'>" >> $@.tmp; \
echo "Building $(UTIL) Failed"; \ echo "Building $(BLD) Failed"; \
else \ else \
echo "<$$type>" >> $@.tmp; \ echo "<$$type>" >> $@.tmp; \
echo "Building $(UTIL) Succeeded"; \ echo "Building $(BLD) Succeeded"; \
fi; \ fi; \
echo '<![CDATA[' >> $@.tmp; \ echo '<![CDATA[' >> $@.tmp; \
cat $@.tmp.2 >> $@.tmp; \ cat $@.tmp.2 >> $@.tmp; \
@ -1038,7 +1038,7 @@ junit.xml:
rm -f $@.tmp.2 rm -f $@.tmp.2
echo "</testcase>" >> $@.tmp echo "</testcase>" >> $@.tmp
echo "</testsuite>" >> $@.tmp echo "</testsuite>" >> $@.tmp
mv $@.tmp "util/$(UTIL)/$@" mv $@.tmp "$(BLD_DIR)$(BLD)/$@"
echo echo
TOOLLIST= \ 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) -x -X $(top)/abuild-chromeos.xml
util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) 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) (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; ) $(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) UTIL="romcc" MFLAGS= MAKEFLAGS= MAKETARGET=test 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