From 1fd63e9330f0ee2af6e744a4d26affd226c8b040 Mon Sep 17 00:00:00 2001 From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr> Date: Fri, 13 Mar 2020 10:08:03 +0100 Subject: [PATCH] Test: refactoring in the test Makefiles --- test/Makefile.dot | 8 ++++++-- test/Makefile.inc | 12 +++++++++--- test/alea-coloring/Makefile | 5 ++++- test/async-unison/Makefile | 4 +++- test/bfs-spanning-tree/Makefile | 5 ++++- test/bfs-st-HC92/Makefile | 5 ++++- test/coloring/Makefile | 6 +++++- test/dfs-list/Makefile | 5 ++++- test/dfs/Makefile | 6 +++++- test/dijkstra-ring/Makefile | 5 ++++- test/skeleton/Makefile | 5 ++++- test/st-CYH91/Makefile | 5 ++++- test/st-KK06-algo1/Makefile | 5 ++++- test/st-KK06-algo2/Makefile | 5 ++++- test/unison/Makefile | 7 +++++-- 15 files changed, 69 insertions(+), 19 deletions(-) diff --git a/test/Makefile.dot b/test/Makefile.dot index d53f06d1..a7c82f99 100644 --- a/test/Makefile.dot +++ b/test/Makefile.dot @@ -1,4 +1,4 @@ -# Time-stamp: <modified the 11/03/2020 (at 11:41) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:34) by Erwan Jahier> # Rules to generate various dot files. @@ -36,5 +36,9 @@ ring30.dot: gg ring -n 30 -o $@ gg-deco $(DECO_PATTERN) $@ -o $@ +ring5.dot: + gg ring -n 5 -o $@ + gg-deco $(DECO_PATTERN) $@ -o $@ + cleandot: - rm -f ring30* er30* er100* grid* ba100* udg* qudg* + rm -f ring5* ring30* er30* er100* grid* ba100* udg* qudg* diff --git a/test/Makefile.inc b/test/Makefile.inc index b7efe14b..111a45b4 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,4 @@ -# Time-stamp: <modified the 25/02/2020 (at 09:51) by Erwan Jahier> +# Time-stamp: <modified the 11/03/2020 (at 13:59) by Erwan Jahier> DIR=../../_build/install/default @@ -23,7 +23,7 @@ LIB=-package algo %_oracle.lus: %.dot %.cmxs sasa -glos $< || echo "==> ok, I'll use the existing $@ file" -%.rif: cmxs %.dot +%.rif: %.cmxs %.dot $(sasa) $(sasaopt) $*.dot -rif > $*.rif %.pdf: @@ -33,6 +33,12 @@ LIB=-package algo %.ocd: %.ml rdbg -camldebug -sut "sasa $.dot" -l 1000 +%.test: %.dot %.cmxs + sasa $< + +%.rdbg: %.dot %.ml + rdbg -sut "sasa $< -dd" + g:gnuplot @@ -41,7 +47,7 @@ s:sim2chrogtk genclean: rm -f *.cmxs sasa *.cm* *.o *.pdf *.rif *.gp *.log *.dro *.seed *.c *.h sasa-*.dot rm -f rdbg-session*.ml luretteSession* *.lut a.out *.cov read_dot.ml - rm -f *.exec *.sh grid*.ml + rm -f *.exec *.sh grid*.ml read_dot.ml ################################################################################## -include Makefile.untracked diff --git a/test/alea-coloring/Makefile b/test/alea-coloring/Makefile index e6a5da1f..81b5c43c 100644 --- a/test/alea-coloring/Makefile +++ b/test/alea-coloring/Makefile @@ -1,9 +1,12 @@ -# Time-stamp: <modified the 23/10/2019 (at 15:40) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:45) by Erwan Jahier> test: ring.cmxs $(sasa) -l 200 ring.dot -cd +DECO_PATTERN="0-:p.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/async-unison/Makefile b/test/async-unison/Makefile index e0cec6cc..00748f4d 100644 --- a/test/async-unison/Makefile +++ b/test/async-unison/Makefile @@ -1,9 +1,11 @@ -# Time-stamp: <modified the 14/02/2020 (at 11:10) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:45) by Erwan Jahier> test: ring.cmxs ring.lut rdbg_test $(sasa) -l 500 ring.dot +DECO_PATTERN="0-:p.ml" +-include ../Makefile.dot sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/bfs-spanning-tree/Makefile b/test/bfs-spanning-tree/Makefile index 11c3005a..8c7e5817 100644 --- a/test/bfs-spanning-tree/Makefile +++ b/test/bfs-spanning-tree/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 22/11/2019 (at 15:41) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:44) by Erwan Jahier> test: test0 test2 lurette0 test0: fig51_noinit.cmxs $(sasa) -rif -l 200 fig51_noinit.dot -sd +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + lutin: fig51_noinit.cmxs $(sasa) -gld fig51_noinit.dot diff --git a/test/bfs-st-HC92/Makefile b/test/bfs-st-HC92/Makefile index ec71cc96..fdbf4c3a 100644 --- a/test/bfs-st-HC92/Makefile +++ b/test/bfs-st-HC92/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 07/02/2020 (at 17:07) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:46) by Erwan Jahier> test: test0 lurette test0: ring.cmxs sasa -l 200 ring.dot +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/coloring/Makefile b/test/coloring/Makefile index adfe3309..2c604f60 100644 --- a/test/coloring/Makefile +++ b/test/coloring/Makefile @@ -1,9 +1,13 @@ -# Time-stamp: <modified the 19/02/2020 (at 10:41) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:45) by Erwan Jahier> + sasa=$(DIR)/bin/sasa -l 100 test: ring.cmxs coloring.rif coloring2.rif lurette +DECO_PATTERN="0-:p.ml" +-include ../Makefile.dot + coloring.rif: ring.cmxs $(sasa) -l 200 ring.dot > $@ diff --git a/test/dfs-list/Makefile b/test/dfs-list/Makefile index 8c2f5320..68ec6ae7 100644 --- a/test/dfs-list/Makefile +++ b/test/dfs-list/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 25/02/2020 (at 15:24) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:47) by Erwan Jahier> test: test0 lurette0 test0: g.cmxs $(sasa) -rif -l 200 g.dot -sd +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + sim2chrogtk: g.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/dfs/Makefile b/test/dfs/Makefile index 1d5a3211..181a7ced 100644 --- a/test/dfs/Makefile +++ b/test/dfs/Makefile @@ -1,10 +1,14 @@ -# Time-stamp: <modified the 24/11/2019 (at 11:39) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:47) by Erwan Jahier> test: test0 lurette0 rdbg_test test0: g.cmxs g.lut $(sasa) -rif -l 200 g.dot -sd +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + + sim2chrogtk: g.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/dijkstra-ring/Makefile b/test/dijkstra-ring/Makefile index 8a128816..3e734295 100644 --- a/test/dijkstra-ring/Makefile +++ b/test/dijkstra-ring/Makefile @@ -1,9 +1,12 @@ -# Time-stamp: <modified the 24/11/2019 (at 15:51) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:46) by Erwan Jahier> test: ring.cmxs lurette1 rdbg_test $(sasa) ring.dot +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + sim2chrogtk: dijkstra-ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/skeleton/Makefile b/test/skeleton/Makefile index e4f38962..a0e051a2 100644 --- a/test/skeleton/Makefile +++ b/test/skeleton/Makefile @@ -1,9 +1,12 @@ -# Time-stamp: <modified the 23/10/2019 (at 15:41) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:44) by Erwan Jahier> test: ring.cmxs sasa -l 200 ring.dot +DECO_PATTERN="0-:p.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/st-CYH91/Makefile b/test/st-CYH91/Makefile index 6c1353f7..48005a48 100644 --- a/test/st-CYH91/Makefile +++ b/test/st-CYH91/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 26/02/2020 (at 16:59) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:47) by Erwan Jahier> test: test0 lurette test0: ring.cmxs sasa -l 200 ring.dot -cd +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + test10: grid10.cmxs sasa -l 20000 grid10.dot -cd > test10.rif diff --git a/test/st-KK06-algo1/Makefile b/test/st-KK06-algo1/Makefile index afcc32dc..ccaaba82 100644 --- a/test/st-KK06-algo1/Makefile +++ b/test/st-KK06-algo1/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 07/02/2020 (at 08:30) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:46) by Erwan Jahier> test: test0 lurette lurette-alt test0: ring.cmxs sasa -l 200 ring.dot +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/st-KK06-algo2/Makefile b/test/st-KK06-algo2/Makefile index f4df5c33..ac387c21 100644 --- a/test/st-KK06-algo2/Makefile +++ b/test/st-KK06-algo2/Makefile @@ -1,10 +1,13 @@ -# Time-stamp: <modified the 07/02/2020 (at 10:18) by Erwan Jahier> +# Time-stamp: <modified the 12/03/2020 (at 17:46) by Erwan Jahier> test: test0 lurette lurette-alt test0: ring.cmxs sasa -l 200 ring.dot +DECO_PATTERN="0:root.ml 1-:p.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null diff --git a/test/unison/Makefile b/test/unison/Makefile index 98832e2f..11d8218f 100644 --- a/test/unison/Makefile +++ b/test/unison/Makefile @@ -1,4 +1,4 @@ -# Time-stamp: <modified the 05/02/2020 (at 13:42) by Erwan Jahier> +# Time-stamp: <modified the 11/03/2020 (at 11:46) by Erwan Jahier> test: test1 test2 lurette0 lurette1 rdbg_test @@ -10,6 +10,9 @@ test2: ring.cmxs sasaopt=-sd +DECO_PATTERN="0-:unison.ml" +-include ../Makefile.dot + sim2chrogtk: ring.rif sim2chrogtk -ecran -in $< > /dev/null @@ -44,5 +47,5 @@ rdbg_test: ring.ml -include ../Makefile.inc -include Makefile.untracked -clean: genclean +clean: genclean cleandot rm -f ring_oracle.lus fig41.ml ring.ml -- GitLab