From 062e408bc77b935798145e29d4031f8105be5086 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 29 Aug 2014 20:10:38 +0200 Subject: [PATCH] build: add what-jenkins-does target This target does (pretty much) exactly the same what jenkins is doing on our build nodes: - complete abuild run of our tree with a given payload - building all libpayload configs we ship - building the cbmem utility In fact at some point we could tell jenkins to just run this command. For debugging, pass along V and Q variables so inner make processes are slightly more noisy on demand. Change-Id: Ib515170603a151cc3c3b10c743f1468a9875dbdc Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/6797 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- Makefile.inc | 6 ++++++ payloads/libpayload/Makefile.inc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 8b11cf6bdf..d72e6f94d3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -565,3 +565,9 @@ $(obj)/coreboot.pre: $(objcbfs)/$(ROMSTAGE_ELF) $(obj)/coreboot.pre1 $(CBFSTOOL) -n $(CONFIG_CBFS_PREFIX)/romstage -c none \ $(CBFSTOOL_PRE_OPTS) mv $@.tmp $@ + +JENKINS_PAYLOAD=none +what-jenkins-does: + util/abuild/abuild -B -J -y -c 4 -p $(JENKINS_PAYLOAD) + (cd payloads/libpayload; $(MAKE) CONFIG_CCACHE=y V=$(V) Q=$(Q) junit.xml) + $(MAKE) V=$(V) Q=$(Q) -C util/cbmem junit.xml diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index a5de4b3ef8..5eeb9077dc 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -122,9 +122,9 @@ junit.xml: echo '' > $@.tmp for i in $(filter-out %.old,$(wildcard configs/*)); do \ $(MAKE) clean; \ - yes | $(MAKE) oldconfig DOTCONFIG=$$i 2>/dev/null >/dev/null; \ + yes | $(MAKE) oldconfig DOTCONFIG=$$i V=$(V) Q=$(Q) 2>/dev/null >/dev/null; \ echo "" >> $@.tmp; \ - $(MAKE) CONFIG_CCACHE=$(CONFIG_CCACHE) DOTCONFIG=$$i >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \ + $(MAKE) V=$(V) Q=$(Q) CONFIG_CCACHE=$(CONFIG_CCACHE) DOTCONFIG=$$i >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \ if [ $$type = "failure" ]; then \ echo "" >> $@.tmp; \ else \