diff options
| -rw-r--r-- | payloads/libpayload/Makefile | 4 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile.inc | 5 |
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 \ |