make CE regression tests more robust

.gitignore

@@ -51,6 +51,7 @@ why3.conf
 /bench/programs/good/loops/
 /bench/programs/good/po/
 /bench/valid/list/
+/bench/ce/*.out
 
 # /bin/
 /bin/why3.byte

bench/ce-bench

 #!/bin/sh
 
+dir=`dirname $0`
 
 case "$1" in
   "-update-oracle")
@@ -14,7 +15,7 @@ esac
 
 run_cvc4_15 () {
   echo -n "  $1... "
-  why3prove -P "CVC4,1.5-prerelease" --get-ce $1 > $1.out
+  $dir/../bin/why3prove.opt -P "CVC4,1.5-prerelease" --get-ce $1 > $1.out
   if cmp $1.oracle $1.out > /dev/null 2>&1 ; then
      echo "ok"
   else
@@ -33,6 +34,6 @@ run_cvc4_15 () {
 
 
 
-for f in bench/ce/*.mlw; do
+for f in $dir/ce/*.mlw; do
     run_cvc4_15 $f
-done
\ No newline at end of file
+done

bench/ce/logic.mlw.oracle

 bench/ce/logic.mlw T g0 : Invalid (0.00s)
 Counter-example model:File bench/ce/logic.mlw:
 Line 6:
-x = {"type":"Integer",
-"val":"48"}
+x = {"type" : "Integer" ,
+"val" : "48" }
 
 bench/ce/logic.mlw T g1 : Invalid (0.00s)
 Counter-example model:File bench/ce/logic.mlw:
 Line 10:
-x = {"type":"Integer",
-"val":"0"}
+x = {"type" : "Integer" ,
+"val" : "0" }
 
 bench/ce/logic.mlw T g2 : Invalid (0.00s)
 Counter-example model:File bench/ce/logic.mlw:
 Line 12:
-X = {"type":"Integer", "val":"1"}
-x2 = {"type":"Integer",
-"val":"1"}
-x3 = {"type":"Integer", "val":"1"}
-x4 = {"type":"Integer",
-"val":"1"}
-x5 = {"type":"Integer", "val":"1"}
-x6 = {"type":"Integer",
-"val":"1"}
-x7 = {"type":"Integer", "val":"1"}
-x8 = {"type":"Integer",
-"val":"1"}
+X = {"type" : "Integer" , "val" : "1" }
+x2 = {"type" : "Integer" ,
+"val" : "1" }
+x3 = {"type" : "Integer" ,
+"val" : "1" }
+x4 = {"type" : "Integer" ,
+"val" : "1" }
+x5 = {"type" : "Integer" ,
+"val" : "1" }
+x6 = {"type" : "Integer" ,
+"val" : "1" }
+x7 = {"type" : "Integer" ,
+"val" : "1" }
+x8 = {"type" : "Integer" ,
+"val" : "1" }