summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-10-13 12:29:19 -0600
committerPatrick Georgi <pgeorgi@google.com>2015-10-15 12:21:23 +0000
commit615f69e53de2d1064478b9c81f04248eaedb5f19 (patch)
tree357070b05144f91ea782abb04201f786b9677bfd
parent21ca9beda44617e134d613274bafc512824e4a1b (diff)
downloadcoreboot-615f69e53de2d1064478b9c81f04248eaedb5f19.tar.xz
Update 'what-jenkins-does' makefile target for junit filename
Instead of renaming the junit filename, send abuild the desired name on the command line. Change-Id: I779bc180343bd549908750d7128bedbab7f36266 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: http://review.coreboot.org/11879 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--Makefile.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 94d33d38fd..0053dfb93b 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -701,8 +701,7 @@ $(obj)/board_id:
JENKINS_PAYLOAD?=none
CPUS?=4
what-jenkins-does:
- util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x
- -mv abuild.xml 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)
(cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml)
$(MAKE) V=$(V) Q=$(Q) -C util/cbmem junit.xml