From a84de47900f9a3d62059fd766f51e976decc9a34 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Sun, 10 Dec 2017 14:27:20 +0100
Subject: [PATCH] fix the CI script: rif files were untracked in the test dir
 which prenvented the tests to run

---
 .gitlab-ci.yml           |   3 -
 _oasis                   |   2 +-
 doc/version.tex          |   6 +-
 setup.ml                 |   9 +-
 src/META                 |   4 +-
 src/lutilsVersion.ml     |   4 +-
 test/ControleurPorte.rif | 321 +++++++++++++++++++++++++++++++++++++++
 test/heater_float.rif    | 100 ++++++++++++
 8 files changed, 433 insertions(+), 16 deletions(-)
 create mode 100644 test/ControleurPorte.rif
 create mode 100644 test/heater_float.rif

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c07b3cc..e3c6fb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,5 @@ test:
   stage: test
   script:
     - cd test
-    - ls -l -R /home/opam/.opam/4.05.0/*
-    - which ocaml
-    - which gnuplot-rif 
     - make test-batch
     
diff --git a/_oasis b/_oasis
index 176cc55..938021e 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        lutils
-Version:     1.31
+Version:     1.32
 Authors:     Erwan Jahier
 Maintainers: erwan.jahier@imag.fr
 License:     GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index ea48315..8453bf2 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.31}
-\newcommand{\sha}{6257b22}
+\newcommand{\version}{1.32}
+\newcommand{\sha}{cba6df2}
 \newcommand{\versionname}{none}
-\newcommand{\versiondate}{08-12-17}
+\newcommand{\versiondate}{10-12-17}
diff --git a/setup.ml b/setup.ml
index c45e400..dd7acce 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.10 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 630a7f40d28152d744a3eb96cf20ae4a) *)
+(* DO NOT EDIT (digest: f8c4139098ea323c8d1691ab8bc2681c) *)
 (*
    Regenerated by OASIS v0.4.10
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6855,7 +6855,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = None;
-          version = "1.31";
+          version = "1.32";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7254,8 +7254,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.10";
-     oasis_digest =
-       Some "\025\252\136\138\147jk\168\022\017\131!\155\178\233\236";
+     oasis_digest = Some "\190\205}\030\242*\136]\134Ox\210\177\015\246\199";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7263,7 +7262,7 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7267 "setup.ml"
+# 7266 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)
diff --git a/src/META b/src/META
index b6b69c5..cab51ce 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: a0a570af5483c9b6089ec5773ab266e8)
-version = "1.31"
+# DO NOT EDIT (digest: 8a67bcca1cfa9f0ede45d720fe4295d3)
+version = "1.32"
 description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
 requires = "unix str camlp4 num"
 archive(byte) = "lutils.cma"
diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml
index 2aedf85..4f81507 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.31"
-let sha="6257b22"
+let str="1.32"
+let sha="cba6df2"
diff --git a/test/ControleurPorte.rif b/test/ControleurPorte.rif
new file mode 100644
index 0000000..1875eb5
--- /dev/null
+++ b/test/ControleurPorte.rif
@@ -0,0 +1,321 @@
+# seed = 1013219512
+#@inputs
+"demande_pass":bool
+"demande_porte":bool
+"pass_baissee":bool
+"pass_rentree":bool
+"porte_ouverte":bool
+"porte_fermee":bool
+"en_marche":bool
+"debut_ramassage":bool
+"fin_ramassage":bool
+@#
+#@outputs
+"baisser_pass":bool
+"rentrer_pass":bool
+"ouvrir_porte":bool
+"fermer_porte":bool
+"porte_et_pass_ok":bool
+@#
+#@locals
+@#
+#step 1
+F T F F F F F T F #outs F F F F T 
+#locs 
+#step 2
+F T F F F F F F F #outs F F F F T 
+#locs 
+#step 3
+F T F T T F F F T #outs F F F T T 
+#locs 
+#step 4
+F F F F F T T F F #outs F F F F T 
+#locs 
+#step 5
+T T F F T F F T F #outs T F F F F 
+#locs 
+#step 6
+F F F F F F F F F #outs F F F F F 
+#locs 
+#step 7
+F T T F F F F F T #outs F F T F F 
+#locs 
+#step 8
+T F F T F F F F F #outs F F F F F 
+#locs 
+#step 9
+T F T F T F F F F #outs F F T F F 
+#locs 
+#step 10
+T F F T F T F F F #outs F T F F T 
+#locs 
+#step 11
+T F T F F F T F F #outs F F F F T 
+#locs 
+#step 12
+T F F F F F T F F #outs F F F F T 
+#locs 
+#step 13
+F T F F F F F T F #outs T F F F F 
+#locs 
+#step 14
+T F T F F T F F F #outs F T T F F 
+#locs 
+#step 15
+T T T F F T F F F #outs F T F F F 
+#locs 
+#step 16
+T T F T F F F F T #outs F F F F T 
+#locs 
+#step 17
+T F F F F F T F F #outs F F F F T 
+#locs 
+#step 18
+F T F F F F F T F #outs F F T F F 
+#locs 
+#step 19
+F T T F F T F F T #outs F F F F F 
+#locs 
+#step 20
+F T F F T F F F F #outs F F F F F 
+#locs 
+#step 21
+T F F T F T F F F #outs F F F F T 
+#locs 
+#step 22
+F T F F F F T F F #outs F F F F T 
+#locs 
+#step 23
+F T F T F F F T F #outs F F T F F 
+#locs 
+#step 24
+T F F F F F F F T #outs F F F F T 
+#locs 
+#step 25
+T F T F T F T F F #outs F F T F F 
+#locs 
+#step 26
+T F F T F F F T F #outs T F F F F 
+#locs 
+#step 27
+T F F T T F F F T #outs F F F T F 
+#locs 
+#step 28
+F T F T F F F F F #outs F F F F F 
+#locs 
+#step 29
+T T F F F T F F F #outs F T F F T 
+#locs 
+#step 30
+T T F T T F T F F #outs F F F F T 
+#locs 
+#step 31
+F T F T F F F T F #outs F F T F F 
+#locs 
+#step 32
+F T F T F T F F F #outs F F F F T 
+#locs 
+#step 33
+F T F F F T F F T #outs F F F F T 
+#locs 
+#step 34
+T T T F F T T F F #outs F T T F F 
+#locs 
+#step 35
+F T F T T F F T F #outs T F F F F 
+#locs 
+#step 36
+F T F F F F F F F #outs F F F F F 
+#locs 
+#step 37
+T F T F F T F F F #outs F T T F F 
+#locs 
+#step 38
+F T T F T F F F T #outs F F F T F 
+#locs 
+#step 39
+T T T F F F F F F #outs F F F F F 
+#locs 
+#step 40
+F F F F F T F F F #outs F T F F F 
+#locs 
+#step 41
+T T F T T F F F F #outs F F F F F 
+#locs 
+#step 42
+F T T F F T F F F #outs F T T F F 
+#locs 
+#step 43
+T T T F F T F F F #outs F T F F F 
+#locs 
+#step 44
+F F F F F T F F F #outs F T F F F 
+#locs 
+#step 45
+T T F T F F F F F #outs F F F F T 
+#locs 
+#step 46
+T T F F T F T F F #outs F F F F T 
+#locs 
+#step 47
+T F T F F F F T F #outs T F T F F 
+#locs 
+#step 48
+T T F T T F F F T #outs F F F T F 
+#locs 
+#step 49
+T F F T T F F F F #outs F F F F F 
+#locs 
+#step 50
+F T F F F T F F F #outs F T F F T 
+#locs 
+#step 51
+F F T F T F T F F #outs F F F F T 
+#locs 
+#step 52
+F T F T F F F T F #outs F F T F F 
+#locs 
+#step 53
+F F T F F F F F F #outs F F F F F 
+#locs 
+#step 54
+T F F T T F F F F #outs F F F F F 
+#locs 
+#step 55
+T F F F F F F F T #outs F F F T F 
+#locs 
+#step 56
+F F F F F T F F F #outs F F F F T 
+#locs 
+#step 57
+F T F F F F T F F #outs F F F F T 
+#locs 
+#step 58
+T T F T F F T F F #outs F F F F T 
+#locs 
+#step 59
+F T F T F F T F F #outs F F F F T 
+#locs 
+#step 60
+T T T F F F T F F #outs F F T F F 
+#locs 
+#step 61
+T F F F T F T F F #outs F F F F F 
+#locs 
+#step 62
+T T F T F T F T F #outs T T F F T 
+#locs 
+#step 63
+T T F T F F F F F #outs F F F F T 
+#locs 
+#step 64
+F F F F F F F F T #outs F F F T T 
+#locs 
+#step 65
+T F F F T F T F F #outs F F F F T 
+#locs 
+#step 66
+T T F F F F F T F #outs T F F F F 
+#locs 
+#step 67
+T T F T F F F F T #outs F F F T F 
+#locs 
+#step 68
+F F F F F F F F F #outs F F F F F 
+#locs 
+#step 69
+F T T F F T F F F #outs F T T F F 
+#locs 
+#step 70
+F T T F F T F F F #outs F T F F F 
+#locs 
+#step 71
+F F T F F T F F F #outs F T F F F 
+#locs 
+#step 72
+T T F F T F F F F #outs F F F F F 
+#locs 
+#step 73
+T F F T F F F F F #outs F F F F F 
+#locs 
+#step 74
+T F F T T F F F F #outs F F F F F 
+#locs 
+#step 75
+T T T F F F F F F #outs F F T F F 
+#locs 
+#step 76
+T F T F F F F F F #outs F F F F F 
+#locs 
+#step 77
+T F F F T F F F F #outs F F F F F 
+#locs 
+#step 78
+F F F F F T F F F #outs F T F F F 
+#locs 
+#step 79
+T T F T F F F F F #outs F F F F T 
+#locs 
+#step 80
+F T F F F F T F F #outs F F F F T 
+#locs 
+#step 81
+T F T F T F F T F #outs T F T F F 
+#locs 
+#step 82
+F F F F F T F F F #outs F T F F F 
+#locs 
+#step 83
+F T T F F F F F F #outs F F T F F 
+#locs 
+#step 84
+T T F F F T F F T #outs F T F F F 
+#locs 
+#step 85
+T F F F T F F F F #outs F F F F F 
+#locs 
+#step 86
+F T F T T F F F F #outs F F F F F 
+#locs 
+#step 87
+F T F F F T F F F #outs F T F F T 
+#locs 
+#step 88
+F F F T T F T F F #outs F F F F T 
+#locs 
+#step 89
+T T F T F F T F F #outs F F F F T 
+#locs 
+#step 90
+F T F T F F T F F #outs F F F F T 
+#locs 
+#step 91
+T F F F F F F T F #outs T F F F F 
+#locs 
+#step 92
+T F F F T F F F F #outs F F F F F 
+#locs 
+#step 93
+F T T F F F F F T #outs F F T F F 
+#locs 
+#step 94
+F T F T F F F F F #outs F F F F F 
+#locs 
+#step 95
+T F T F T F F F F #outs F F T F F 
+#locs 
+#step 96
+T T F T F T F F F #outs F T F F T 
+#locs 
+#step 97
+T F T F F F T F F #outs F F F F T 
+#locs 
+#step 98
+T F T F T F T F F #outs F F F F T 
+#locs 
+#step 99
+T F F F F F F T F #outs T F F F F 
+#locs 
+#step 100
+T T F F F F F F T #outs F F F T F 
+#locs 
diff --git a/test/heater_float.rif b/test/heater_float.rif
new file mode 100644
index 0000000..4e51509
--- /dev/null
+++ b/test/heater_float.rif
@@ -0,0 +1,100 @@
+# seed = 1013219512
+#@inputs
+"U":real
+@#
+#@outputs
+"Heat_on":bool
+@#
+#@locals
+"temp_float__Dudt":real
+@#
+#step 1
+17.0000 #outs T 
+#locs 0.0000 
+#step 2
+17.0000 #outs T 
+#locs 0.7495 
+#step 3
+17.7495 #outs T 
+#locs 1.8546 
+#step 4
+19.6041 #outs T 
+#locs 0.3648 
+#step 5
+19.9689 #outs T 
+#locs 0.6658 
+#step 6
+20.6348 #outs F 
+#locs 0.1093 
+#step 7
+20.7440 #outs F 
+#locs -2.0367 
+#step 8
+18.7073 #outs F 
+#locs -4.0988 
+#step 9
+14.6086 #outs T 
+#locs -1.5143 
+#step 10
+13.0942 #outs T 
+#locs 1.7047 
+#step 11
+14.7990 #outs T 
+#locs 0.4567 
+#step 12
+15.2557 #outs T 
+#locs 0.5208 
+#step 13
+15.7765 #outs T 
+#locs 1.8002 
+#step 14
+17.5767 #outs T 
+#locs 0.9888 
+#step 15
+18.5655 #outs T 
+#locs 0.8065 
+#step 16
+19.3720 #outs T 
+#locs 0.7214 
+#step 17
+20.0934 #outs F 
+#locs 1.8262 
+#step 18
+21.9196 #outs F 
+#locs -2.8752 
+#step 19
+19.0444 #outs F 
+#locs -2.4766 
+#step 20
+16.5677 #outs F 
+#locs -2.5972 
+#step 21
+13.9706 #outs T 
+#locs -1.6174 
+#step 22
+12.3532 #outs T 
+#locs 1.0642 
+#step 23
+13.4173 #outs T 
+#locs 1.0250 
+#step 24
+14.4424 #outs T 
+#locs 1.3724 
+#step 25
+15.8148 #outs T 
+#locs 1.8060 
+#step 26
+17.6208 #outs T 
+#locs 0.7024 
+#step 27
+18.3232 #outs T 
+#locs 0.6014 
+#step 28
+18.9246 #outs T 
+#locs 1.2588 
+#step 29
+20.1834 #outs F 
+#locs 0.9527 
+#step 30
+21.1361 #outs F 
+#locs -2.4303 
-- 
GitLab