test: fix lustre-mt tests + an issue with the new version of dejagnu

test/Makefile

@@ -123,28 +123,28 @@ unexp:
 	grep unexp lus2lic.sum
 
 lus2lic0.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic0 lus2lic.tests/test0.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic0 test0.exp" || true
 
 lus2lic1.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic1 lus2lic.tests/test1.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic1 test1.exp" || true
 
 lus2lic2.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic2 lus2lic.tests/test2.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic2 test2.exp" || true
 
 lus2lic3.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic3 lus2lic.tests/test3.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic3 test3.exp" || true
 
 lus2lic4.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic4 lus2lic.tests/test4.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic4 test4.exp" || true
 
 
 kcg.log:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic-kcg lus2lic.tests/kcg.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic-kcg kcg.exp" || true
 
 kcg: kcg.log
 
 progression:
-	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic lus2lic.tests/progression.exp" || true
+	$(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic progression.exp" || true
 
 
 

test/lustre-mt

+../_build/default/bin/lustre-mt/main.exe
\ No newline at end of file

test/should_work/lustre-mt

+../lustre-mt
\ No newline at end of file

utils/compare_exec_and_2cmc

@@ -25,13 +25,13 @@ set -x verbose #echo on
 if
     [ -f $env_node ];
 then
-   echo "$env_node generated" 
-    
+   echo "$env_node generated"
+
 else if
      ./lus2lic $OPT $lustre_file -n $node --gen-autotest -np;
      cat $lustre_file  >> $_oracle;
 then
-     echo "./lus2lic $OPT $lustre_file -n $node --gen-autotest -np: ok" 
+     echo "./lus2lic $OPT $lustre_file -n $node --gen-autotest -np: ok"
 else
     echo "Error"
     exit 2
@@ -39,7 +39,7 @@ fi
 fi
 
 if
-    ./lus2lic -dir /tmp/lustre-test-$lustre_file-$node $OPT $_oracle -n $oracle  -2c -cc -o $node-oracle.exec;    
+    ./lus2lic -dir /tmp/lustre-test-$lustre_file-$node $OPT $_oracle -n $oracle  -2c -cc -o $node-oracle.exec;
 then
     echo "lus2lic -2c done"
 else
@@ -50,7 +50,7 @@ fi
 # generated the -2cmc version in $node.exec
 if
     ./lus2lic -dir /tmp/lustre-test-$lustre_file-$node $OPT $lustre_file -n $node  -2cmt &&
-    $HOME/.opam/4.14.2/bin/lustre-mt /tmp/lustre-test-$lustre_file-$node/${node}_${node}.yml &&
+    ./lustre-mt /tmp/lustre-test-$lustre_file-$node/${node}_${node}.yml &&
     mv para.* /tmp/lustre-test-$lustre_file-$node &&
     mv *env* /tmp/lustre-test-$lustre_file-$node &&
     mv *oracle* /tmp/lustre-test-$lustre_file-$node &&

utils/lustre-mt

+../_build/default/bin/lustre-mt/main.exe
\ No newline at end of file