non-reg tests: some work on the rdbg-based compiler comparison script.

The objective is touse rdbg instead of lurettetop to perform compiler
comparisons. I will plug it later (cf test/site.exp)

utils/test_lus2lic_no_node

@@ -59,7 +59,7 @@ if
 #    -rp "sut:v4:$lv4:$lv4_node" \
 
 
-./lurettetop -p 6  -seed 42 \
+./lurettetop -p 6 -seed 42 \
     -rp "sut:ec:$ec:$lv4_node" \
     -rp "env:lutin:$env" \
     -rp "oracle:v6:$_oracle:$oracle:$OPT" \

utils/test_lus2lic_no_node_rdbg

 #!/bin/sh 
 
+# compares with rdbg -lurette the results of:
+#   lus2lic -ec and ecexe
+#   lus2lic -exec
 
-ocamlopt=/usr/local/soft/ocaml/4.01.0/bin/ocamlopt.opt
+eval `opam config env`
+ocamlopt=ocamlopt.opt
 lustre_file=$1
+OPT=$2
 node=`basename $lustre_file .lus`
 _oracle=_"$node"_oracle.lus
 oracle="$node"_oracle
@@ -11,10 +16,12 @@ ec="$node".ec
 lv4_node="$node__$node"
 env=_"$node"_env.lut
 export RDBG_PATH="$HOME/rdbg"
+
 set -x verbose #echo on
+set -e # stop at the first error!
 
 if
-./lus2lic $lustre_file -n $node --gen-autotest -np;
+./lus2lic $OPT $lustre_file -n $node --gen-autotest -np;
 then
    echo "lus2lic --gen-autotest done" 
 else
@@ -31,7 +38,7 @@ if
     ./lus2lic $lustre_file -n $node  -ec  -o $ec;
 #    ./lus2lic $lustre_file -n $node  -en -lv4 -eei --no-prefix -o $lv4;
 then
-    echo "lus2lic -lv4 done"
+    echo "lus2lic -ec done"
 else
     echo "Error"
     exit 2
@@ -51,11 +58,7 @@ export PATH=/usr/local/tools/lustre/v4/bin/:$PATH
 #  fi
 
 
-
-
 export CMXA="polka.cmxa bdd.cmxa lut4ocaml.cmxa"
-export CLIB="-cclib -lgmp -cclib -lpolkag_caml -cclib -lpolkal_caml -cclib -lpolkai_caml -cclib  -lcamlidl -cclib  -lpolkag -cclib -lpolkal -cclib -lpolkai  -cclib -lbdd_stubs -cclib -lEzdl_c_stubs" 
-
 
 #  ./lurettetop -p 6  -seed 42 \
 #      -rp "sut:ec:$ec:$lv4_node" \
@@ -64,47 +67,28 @@ export CLIB="-cclib -lgmp -cclib -lpolkag_caml -cclib -lpolkal_caml -cclib -lpol
 #      -l 10;
 #--stop-on-oracle-error;
 
-if
-        echo "Generating oracle.cmxs";
-        ./lus2lic -ocaml -o oracle.ml $_oracle -n $oracle &&
-        $ocamlopt -shared -o  oracle.cmxs -I +lustre-v6 -I +rdbg-plugin  lus4ocaml.cmxa oracle.ml &&
-        
-         echo "Generating sut.cmxs" &&
-          ./lus2lic -ocaml -o sut.ml $ec -n $lv4_node &&
-          $ocamlopt -shared -o sut.cmxs    -I +lustre-v6 -I +rdbg-plugin lus4ocaml.cmxa sut.ml &&
-
-        echo "Generating env.cmxs" &&
-        ./lutin  -seed 42 -ocaml -o env.ml $env &&
-        $ocamlopt -shared -o  env.cmxs    -I +lutin   -I +rdbg-plugin  $CLIB $CMXA env.ml &&
-        
-        ./lurettetop -p 6  -seed 42 \
-            -rp "sut:ec:$ec:$lv4_node" \
-            -rp "env:lutin:$env" \
-            -rp "oracle:v6:$_oracle:$oracle" \
-            -go -l 10 -ns2c --stop-on-oracle-error;
-
-    echo "  $RDBG_PATH/rdbgbatch.native -lurette --seed 42 -l 100 -p 6 --stop-on-oracle-error \
-        --sut sut.cmxs \
-        --env env.cmxs \
-        --oracle oracle.cmxs  ";
-
-    echo "  $RDBG_PATH/rdbgbatch.native -lurette --seed 42 -l 100 -p 6 --stop-on-oracle-error \
-          --sut-stdio  \"./patch_ecexe $ec $lv4_node\"  \
-          --env-stdio \"./lutin -boot -rif $env\" \
-          --oracle-stdio \"./lus2lic -exec -rif $_oracle -n $oracle\"  ";
+msg="An error occured in $0. Aborting."
+
+echo "Generating oracle.cmxs"
+./lus2lic  $OPT -ocaml -o oracle.ml --expand-io-type $_oracle -n $oracle
+$ocamlopt -shared -o  oracle.cmxs -I +rdbg-plugin -I +lustre-v6 lustre-v6.cmxa  oracle.ml
+
+echo "Generating env.cmxs" 
+./lutin -seed 42 -ocaml -o env.ml $env
+$ocamlopt -shared -o env.cmxs -I +rdbg-plugin -I +lutin    $CMXA env.ml
+
+echo "oracle.cmxs and env.cmxs are generated."
+# $RDBG_PATH/rdbgbatch.native
+eval "./rdbg-batch  -lurette -l 10 -p 6 --stop-on-oracle-error  --sut-stdio  \"./patch_ecexe $ec $lv4_node\"  --env env.cmxs      --oracle oracle.cmxs "
+
+#  echo "  $RDBG_PATH/rdbgbatch.native -lurette --seed 42 -l 100 -p 6 --stop-on-oracle-error \
+#            --sut-stdio  \"./patch_ecexe $ec $lv4_node\"  \
+#            --env-stdio \"./lutin -boot -rif $env\" \
+#            --oracle-stdio \"./lus2lic -exec -rif $_oracle -n $oracle\"  ";
 #        --sut sut.cmxs \
 #          --env-stdio "./lutin -boot -rif $env" \
 #          --oracle-stdio "./lus2lic -exec -rif $_oracle -n $oracle"  ;
 
     
-#$RDBG_PATH/rdbgbatch.native -lurette --seed 42 -p 6 -l 10 --stop-on-oracle-error  \
-#        --sut-stdio  "./patch_ecexe $ec $lv4_node"  \
-#        --env-stdio "./lutin -boot -rif $env" \
-#        --oracle-stdio "./lus2lic -exec -rif $_oracle -n $oracle"  ;
-then
 echo "rdbg -lurette: ok"
-else
-     echo "error"
-     exit 2
-fi
 exit 0