From 8bece21980ea4b479923b55ee7b6fd8ddf594536 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Thu, 16 Nov 2017 06:22:25 -0800
Subject: [PATCH] CI: rework compile test

---
 tests/05-compile-tools/Makefile |  4 +--
 tests/Makefile.compile-test     | 46 +++++++--------------------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/tests/05-compile-tools/Makefile b/tests/05-compile-tools/Makefile
index 184ce1e4c..504cbcf9f 100644
--- a/tests/05-compile-tools/Makefile
+++ b/tests/05-compile-tools/Makefile
@@ -25,11 +25,11 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-TOOLS= tools sky
+TOOLS=tools sky
 TOOLSDIR=../../tools
 TESTLOGS=$(patsubst %,%.testlog, $(TOOLS))
 
-all: summary
+all: clean summary
 
 tools.testlog:
 	@echo -n Building tool: $(basename $@)
diff --git a/tests/Makefile.compile-test b/tests/Makefile.compile-test
index eae96c1df..9e5bd4083 100644
--- a/tests/Makefile.compile-test
+++ b/tests/Makefile.compile-test
@@ -27,8 +27,6 @@
 
 all: clean summary
 
-build: examples tools
-
 # The stuff below is some GNU make magic to automatically make make
 # give each compile test a number, prefixed with a 0 if the number is
 # < 10, to match the way the simulation tests output works.
@@ -40,13 +38,13 @@ get_target = $(firstword $(subst :, ,$1))
 get_target_vars = $(wordlist 2,15,$(subst :, ,$1))
 
 define dooneexample
-@echo Building example $(3): $(1) $(4) for target $(2)
+@echo -n Building example $(3): $(1) $(4) for target $(2)
 @((cd $(EXAMPLESDIR)/$(1); \
  make $(4) TARGET=$(2) clean && make $(4) TARGET=$(2) WERROR=1) > \
-      $(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
- (echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
- (echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \
-  tail -10 $(3)-$(subst /,-,$(1))$(2).report | tee $(3)-$(subst /,-,$(1))$(2).faillog))
+      /dev/null 2>make.runerr && \
+ (echo " -> OK" && printf "%-75s %-35s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \
+ (echo " -> FAIL" && printf "%-75s %-35s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.runerr))
+@rm -f make.runerr
 endef
 
 define doexample
@@ -55,40 +53,16 @@ $(call dooneexample,$(dir $(call get_target,${1})),$(notdir $(call get_target,${
 endef
 #end of GNU make magic
 
-
 examples:
 	$(foreach ex, $(EXAMPLES), $(call doexample, ${ex}))
 
-report: build
-	@echo Examples | cat - ??-*.report > report
-	@echo Tools | cat - $(foreach tool, $(TOOLS), $(tool).report) >> report
-
-examples-summary: build
-	@echo Example summary | cat - $(foreach example, $(EXAMPLES), \
-             $(foreach target, $(EXAMPLESTARGETS), $(example)-$(target).summary)) > \
-               $@
-	@echo Tools summary | cat - $(foreach tool, $(TOOLS), $(tool).summary) >> $@
-
-faillog-summary: build
-	@rm -f $@; touch $@
-	@$(foreach log, $(wildcard *.faillog), grep -H '' $(log) >> $@;)
-
-summary: examples-summary faillog-summary
-	@cat *.summary > $@
-	@ls -1 ??-*.faillog > /dev/null 2>&1; [ $$? = 0 ] && tail -v ??-*.faillog >> $@ || true
-	@rm -f $^
-
-tools:
-	@$(foreach tool, $(TOOLS), \
-           (((cd $(TOOLSDIR)/$(tool); make) > $(tool).report 2>&1) && \
-             (echo $(tool): OK | tee $(tool).summary) || \
-             (echo $(tool): FAIL | tee $(tool).summary ; \
-                tail -10 $(tool).report > $(tool).faillog)) ; )
+summary: examples
+	@cat *.testlog > summary
+	@echo "========== Summary =========="
+	@cat summary
 
 clean:
-	@rm -f *.summary *.report *.faillog summary report
+	@rm -f *.testlog summary
 	@$(foreach example, $(EXAMPLES), \
            $(foreach target, $(EXAMPLESTARGETS), \
              (cd $(EXAMPLESDIR)/$(example); make TARGET=$(target) clean);))
-	@$(foreach tool, $(TOOLS), \
-           (cd $(TOOLSDIR)/$(tool); make clean);)