From 01e4df83ae9f1053b5f993fa8024e825e4d6fcd6 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 23 Jan 2023 16:54:44 +0100
Subject: [PATCH] build: make sure that no topo.ml files lies around
---
test/Makefile.inc | 20 ++++++++++++--------
test/alea-coloring/Makefile | 6 +++---
test/alea-coloring/config.ml | 4 ----
test/bfs-st-HC92/Makefile | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 5a47df66..76cc439c 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 19/01/2023 (at 14:18) by Erwan Jahier>
+# Time-stamp: <modified the 23/01/2023 (at 14:31) by Erwan Jahier>
#
# Define some default rules that ought to work most of the time
#
@@ -29,13 +29,17 @@ endif
# %.cma: %.ml
# $(OCAMLC) $(LIB) -a state.ml $(shell sasa -algo $*.dot) $< -o $@
-%.cmxs: %.dot
+%.cmxs:
+ [ -f $*.ml ] && rm $*.ml || true
topology=$* dune build
-%.cma: %.dot
+%.cma:
+ [ -f $*.ml ] && rm $*.ml || true
topology=$* dune build
-%.cmxa: %.dot
+%.cmxa:
+ [ -f $*.ml ] && rm $*.ml || true
topology=$* dune build
-%.a: %.dot
+%.a:
+ [ -f $*.ml ] && rm $*.ml || true
topology=$* dune build
@@ -46,7 +50,7 @@ genclean:
dune clean
clean: genclean
-.PRECIOUS: %.ml
+.PRECIOUS: %.dot
##################################################################################
#
@@ -98,8 +102,8 @@ ifndef SEED
endif
############################################################################################
-%.rdbg: %.dot
- ledit -h rdbg-history -x rdbg --sasa -sut "sasa $< $(DAEMON)" -l 10000
+%.rdbg: %.cma
+ ledit -h rdbg-history -x rdbg --sasa -sut "sasa $* $(DAEMON)" -l 10000
%.rdbg-test: %.cma
rdbg --sasa -sut "sasa $*.dot $(DAEMON)" -go --input some_session -l 10000
diff --git a/test/alea-coloring/Makefile b/test/alea-coloring/Makefile
index 68155fc4..b0229759 100644
--- a/test/alea-coloring/Makefile
+++ b/test/alea-coloring/Makefile
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 17/01/2023 (at 14:34) by Erwan Jahier>
+# Time-stamp: <modified the 21/01/2023 (at 11:44) by Erwan Jahier>
DECO_PATTERN="0-:p.ml"
DAEMON=-sd
@@ -30,11 +30,11 @@ gnuplot: ring.rif
gnuplot-rif $<
# Interactive session with lutin
-rdbg: ring.lut ring.ml
+rdbg: ring.lut ring.cma
rdbg --sasa -o ring.rif \
-env "$(sasa) ring.dot -custd -rif" \
-sut-nd "lutin ring.lut -n distributed"
-rdbg3: ring.ml
+rdbg3: ring.cma
rdbg --sasa -o ring.rif -sut "$(sasa) ring.dot -cd -rif"
diff --git a/test/alea-coloring/config.ml b/test/alea-coloring/config.ml
index 87a9ca93..24bae2fb 100644
--- a/test/alea-coloring/config.ml
+++ b/test/alea-coloring/config.ml
@@ -1,7 +1,3 @@
-(* Automatically generated by /home/jahier/.opam/4.10.0/bin/sasa version "4.2.8-23-gd6b73fc" ("d6b73fc")*)
-(* on crevetete the 1/9/2020 at 17:26:45*)
-(*sasa -reg ring.dot*)
-
let potential = None (* None => only -sd, -cd, -lcd, -dd, or -custd are possible *)
let legitimate = None (* None => only silent configuration are legitimate *)
diff --git a/test/bfs-st-HC92/Makefile b/test/bfs-st-HC92/Makefile
index b7a58b11..49bdf91e 100644
--- a/test/bfs-st-HC92/Makefile
+++ b/test/bfs-st-HC92/Makefile
@@ -1,8 +1,8 @@
-# Time-stamp: <modified the 18/01/2023 (at 10:53) by Erwan Jahier>
+# Time-stamp: <modified the 23/01/2023 (at 16:46) by Erwan Jahier>
DECO_PATTERN="0:root.ml 1-:p.ml"
--include ../Makefile.dot
--include ../Makefile.inc
+-include ./Makefile.dot
+-include ./Makefile.inc
-include Makefile.untracked
##############################################################################
--
GitLab