From 9ae834667f8f22a225ef768f30e35e442f08cb8b Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 5 Sep 2022 15:56:51 +0200
Subject: [PATCH] test: don't use /use/bin/time if not installed
---
salut/test/Makefile.inc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/salut/test/Makefile.inc b/salut/test/Makefile.inc
index e2239e9e..e918db87 100644
--- a/salut/test/Makefile.inc
+++ b/salut/test/Makefile.inc
@@ -88,13 +88,19 @@ ifndef $(kind2_opt)
kind2_opt = --modular true --compositional true
endif
+ifneq ("$(wildcard /usr/bin/time)","")
+ TIME=/usr/bin/time
+else
+ TIME=
+endif
+
%.expand.kind2: %_verify.lv4
- time kind2 --color $(color) $(kind2_opt) $<
+ $(TIME) kind2 --color $(color) $(kind2_opt) $<
%.kind2: %.dot
make $*_verify.noexpand.lv4
- time kind2 --color $(color) $(kind2_opt) $*_verify.noexpand.lv4
+ $(TIME) kind2 --color $(color) $(kind2_opt) $*_verify.noexpand.lv4
%.kind2-test:
make color=false $*.kind2 | (grep "^ok: valid" > $*-kind2.res || echo "") ; [ -s $*-kind2.res ]
@@ -126,7 +132,7 @@ endif
%.lesar:%_verify.ec
- time lesar $< $(prop) -forward -states 10000000
+ $(TIME)lesar $< $(prop) -forward -states 10000000
##########################################################################################"
# Compare sasa and salut simulation perf
@@ -139,9 +145,9 @@ endif
%.comperf.old: %.dot %.cmxs %_oracle.lus %.lus
lv6 -en -2c $*.lus $*_oracle.lus -n oracle && \
sh oracle.sh && \
- /usr/bin/time -o sasa2.time lurette -norif -env "sasa -seed 42 -custd $*.dot $(SASAFLAGS) " \
+ $(TIME) -o sasa2.time lurette -norif -env "sasa -seed 42 -custd $*.dot $(SASAFLAGS) " \
-sut "sasa -seed 42 $*.dot $(SASAFLAGS)" &&\
- /usr/bin/time -o salut.time lurette -norif -env "sasa -seed 42 -custd $*.dot $(SASAFLAGS) " \
+ $(TIME) -o salut.time lurette -norif -env "sasa -seed 42 -custd $*.dot $(SASAFLAGS) " \
-oracle "./oracle.exec" \
-sut "sasa -seed 42 $*.dot $(SASAFLAGS)" && \
cat sasa.time sasa2.time salut.time
--
GitLab