summaryrefslogtreecommitdiff
path: root/payloads/libpayload
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-03-23 16:07:54 -0600
committerMartin Roth <martinroth@google.com>2016-03-25 18:18:27 +0100
commit6959f5c915e8455ae7bc84aef7250cde62fa2637 (patch)
tree84cc48d1e116db30a71ef3420ce1a381f713cd02 /payloads/libpayload
parent591790fca5f3e2ce0b1e4fa6099f59aaf9546c95 (diff)
downloadcoreboot-6959f5c915e8455ae7bc84aef7250cde62fa2637.tar.xz
libpayload: update junit.xml target, clean up output
- Copy each config in configs/ to the junit_config, update each, in turn, and clean up when done. This avoids updating the saved config files and creating dirty files in git. - Use 'make olddefconfig' instead of 'yes "" | make oldconfig' - Update clean target to remove junit_config file - Update distclean target to remove junit.xml Change-Id: Ib023eb3197f2d8806c73c9c18464157ce3de958f Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/14164 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload')
-rw-r--r--payloads/libpayload/Makefile4
-rw-r--r--payloads/libpayload/Makefile.inc5
2 files changed, 5 insertions, 4 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 1b42e2995e..00fb5374bb 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -303,13 +303,13 @@ clean-for-update: doxygen-clean clean-for-update-target
rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
clean: clean-for-update clean-target
- rm -f .ccwrap
+ rm -f .ccwrap junit_config junit_config.old
clean-cscope:
rm -f cscope.out
distclean: clean-cscope
rm -rf $(obj)
- rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile
+ rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile junit.xml
.PHONY: $(PHONY) clean clean-cscope cscope distclean doxygen doxy
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index a449f7abcf..b88cd20ea1 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -130,9 +130,10 @@ junit.xml:
echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp
for i in $(filter-out %.old,$(wildcard configs/*)); do \
$(MAKE) clean; \
- yes "" | $(MAKE) oldconfig DOTCONFIG=$$i V=$(V) Q=$(Q) 2>/dev/null >/dev/null; \
+ cp "$$i" junit_config; \
+ $(MAKE) olddefconfig DOTCONFIG=junit_config V=$(V) Q=$(Q) 2>/dev/null >/dev/null; \
echo "<testcase classname='libpayload' name='$$i'>" >> $@.tmp; \
- $(MAKE) V=$(V) Q=$(Q) CONFIG_LP_CCACHE=$(CONFIG_LP_CCACHE) DOTCONFIG=$$i >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
+ $(MAKE) V=$(V) Q=$(Q) CONFIG_LP_CCACHE=$(CONFIG_LP_CCACHE) DOTCONFIG=junit_config >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
if [ $$type = "failure" ]; then \
echo "<failure type='buildFailed'>" >> $@.tmp; \
else \