No not plot so many jobs

[can-benchmark.git] / gw-tests / Makefile

diff --git a/gw-tests/Makefile b/gw-tests/Makefile
index 2ede079d389ea87a53b4097c1d6dbd6e2a6c7f7d..520bc6c3962e9880087b2b8ffd5ca755594893c7 100644 (file)
--- a/gw-tests/Makefile
+++ b/gw-tests/Makefile
@@ -1,27 +1,37 @@
-T=$(filter-out lib.sh,$(wildcard *.sh))
+T:=$(filter-out lib.sh,$(wildcard *.sh))
 
-.PHONY: $(T)
+# Run slow test at the end
+T:=$(filter-out filter%,$(T)) $(filter filter%,$(T))
 
-all: $(T) html
+.PHONY: $(T:%=run-%)
+
+all: $(T:%=run-%) html
        @echo "Run 'make plot' to generate graphs"
 
-TEST_FLAGS = -P -t all
+TEST_FLAGS = -P -t all -l all
 
-$(T):%:
-       ./$@ $(TEST_FLAGS)
+$(T:%=run-%):run-%:
+       ./$* $(TEST_FLAGS)
 
 .PHONY: plot plotall
-PLOT_SCRIPTS=$(shell find results -name plot.sh)
-THUMBS=$(PLOT_SCRIPTS:%/plot.sh=%/thumb)
-plot: $(THUMBS)
-%/thumb: %/plot.sh
-       $*/plot.sh -X
-
-plotall: $(PLOT_SCRIPTS:%=run-%)
-run-%: %
-       $* -X
 
+PLOT_SCRIPTS=$(shell find results -name plot.sh)
 
+define plot_template
+plot: $1/graph.png
+$1/graph.png: $1/plot.sh $(notdir $1).sh lib.sh $(wildcard $1/*.txt)
+       $1/plot.sh -X
+endef
+
+define plotall_template
+plotall: plot-$1
+.PHONY: plot-$1
+plot-$1:
+       $1/plot.sh -X
+endef
+
+$(foreach result_dir,$(PLOT_SCRIPTS:%/plot.sh=%),$(eval $(call plot_template,$(result_dir))))
+$(foreach result_dir,$(PLOT_SCRIPTS:%/plot.sh=%),$(eval $(call plotall_template,$(result_dir))))
 
 .PHONY: html
 html: