Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sasa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
verimag
synchrone
sasa
Commits
9ae83466
Commit
9ae83466
authored
2 years ago
by
erwan
Browse files
Options
Downloads
Patches
Plain Diff
test: don't use /use/bin/time if not installed
parent
2d00b831
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#108282
passed
2 years ago
Stage: build
Stage: release
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
salut/test/Makefile.inc
+11
-5
11 additions, 5 deletions
salut/test/Makefile.inc
with
11 additions
and
5 deletions
salut/test/Makefile.inc
+
11
−
5
View file @
9ae83466
...
@@ -88,13 +88,19 @@ ifndef $(kind2_opt)
...
@@ -88,13 +88,19 @@ ifndef $(kind2_opt)
kind2_opt
=
--modular
true
--compositional
true
kind2_opt
=
--modular
true
--compositional
true
endif
endif
ifneq
("$(wildcard /usr/bin/time)","")
TIME
=
/usr/bin/time
else
TIME
=
endif
%.expand.kind2
:
%_verify.lv4
%.expand.kind2
:
%_verify.lv4
time
kind2
--color
$(
color
)
$(
kind2_opt
)
$<
$(
TIME
)
kind2
--color
$(
color
)
$(
kind2_opt
)
$<
%.kind2
:
%.dot
%.kind2
:
%.dot
make
$*
_verify.noexpand.lv4
make
$*
_verify.noexpand.lv4
time
kind2
--color
$(
color
)
$(
kind2_opt
)
$*
_verify.noexpand.lv4
$(
TIME
)
kind2
--color
$(
color
)
$(
kind2_opt
)
$*
_verify.noexpand.lv4
%.kind2-test
:
%.kind2-test
:
make
color
=
false
$*
.kind2 |
(
grep
"^ok: valid"
>
$*
-kind2
.res
||
echo
""
)
;
[
-s
$*
-kind2
.res
]
make
color
=
false
$*
.kind2 |
(
grep
"^ok: valid"
>
$*
-kind2
.res
||
echo
""
)
;
[
-s
$*
-kind2
.res
]
...
@@ -126,7 +132,7 @@ endif
...
@@ -126,7 +132,7 @@ endif
%.lesar
:
%_verify.ec
%.lesar
:
%_verify.ec
time
lesar
$<
$(
prop
)
-forward
-states
10000000
$(
TIME
)
lesar
$<
$(
prop
)
-forward
-states
10000000
##########################################################################################"
##########################################################################################"
# Compare sasa and salut simulation perf
# Compare sasa and salut simulation perf
...
@@ -139,9 +145,9 @@ endif
...
@@ -139,9 +145,9 @@ endif
%.comperf.old
:
%.dot %.cmxs %_oracle.lus %.lus
%.comperf.old
:
%.dot %.cmxs %_oracle.lus %.lus
lv6
-en
-2c
$*
.lus
$*
_oracle.lus
-n
oracle
&&
\
lv6
-en
-2c
$*
.lus
$*
_oracle.lus
-n
oracle
&&
\
sh oracle.sh
&&
\
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
)
"
&&
\
-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"
\
-oracle
"./oracle.exec"
\
-sut
"sasa -seed 42
$*
.dot
$(
SASAFLAGS
)
"
&&
\
-sut
"sasa -seed 42
$*
.dot
$(
SASAFLAGS
)
"
&&
\
cat
sasa.time sasa2.time salut.time
cat
sasa.time sasa2.time salut.time
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment