mise en place de tests pour lustre mt

test/site.exp

@@ -6,14 +6,14 @@ set testdir [pwd]
 set lus2lic "./lus2lic"
 set ec2c "./ec2c"
 set ec2c "./myec2c"
-set test_lus2lic_no_node "$testdir/../utils/test_lus2lic_no_node_rdbg"
-set test_lus2lic_no_node "$testdir/../utils/test_lus2lic_no_node"
-set compare_exec_and_2c "$testdir/../utils/compare_exec_and_2c"
-set compare_exec_and_2cmc "$testdir/../utils/compare_exec_and_2cmc"
-set compare_lv6_and_lv6_en "$testdir/../utils/compare_lv6_and_lv6_en"
-set compare_gcc_and_clang "$testdir/../utils/compare_gcc_and_clang"
-set compare_2ch_and_2cs "$testdir/../utils/compare_2ch_and_2cs"
-set check_knc "$testdir/../utils/check_knc"
+set test_lus2lic_no_node "./../../utils/test_lus2lic_no_node_rdbg"
+set test_lus2lic_no_node "./../../utils/test_lus2lic_no_node"
+set compare_exec_and_2c "./../../utils/compare_exec_and_2c"
+set compare_exec_and_2cmc "./../../utils/compare_exec_and_2cmc"
+set compare_lv6_and_lv6_en "./../../utils/compare_lv6_and_lv6_en"
+set compare_gcc_and_clang "./../../utils/compare_gcc_and_clang"
+set compare_2ch_and_2cs "./../../utils/compare_2ch_and_2cs"
+set check_knc "./../../utils/check_knc"
 set timeout 10
 
 proc should_work { test_name command_line args } {
@@ -337,18 +337,22 @@ proc nonreg_pass2 {files tmp} {
             if { [nonemptyfile "$bf.c"] && [do_ecexe_vs_exec "$f"] } {
                 set id4 [should_work "Try to compare lus2lic -exec and ecexe" \
                          "$test_lus2lic_no_node" "$f"  "$opt"]
+                # XXX TODO: 
+                # wait -i $id4 
+                # if { [nonemptyfile "$bf.exec"] } {
+                set id5 [should_work "Try to compare lv6 -2c vs lv6 -knc/-knpc -lv4 |lv6 -2c" \
+                        "$check_knc" "$f" "$opt"]
+
+                set id6 [should_work "Try to compare -exec and -2cmc" \
+                        "$compare_exec_and_2cmc" "$f" "$opt"]
                 catch { exp_close -i $id4 }
                 catch { exp_wait  -i $id4 } output
 
-		set id5 [should_work "Try to compare lv6 -2c vs lv6 -knc/-knpc -lv4 |lv6 -2c" \
-			     "$check_knc" "$f" "$opt"]
 		catch { exp_close -i $id5 }
 		catch { exp_wait  -i $id5 } output
 
-		#set id6 [should_work "Try to compare -exec and -2cmc" \
-	#		     "$compare_exec_and_2cmc" "$f" "$opt"]
-	#	catch { exp_close -i $id6 }
-	#	catch { exp_wait  -i $id6 } output
+		catch { exp_close -i $id6 }
+		catch { exp_wait  -i $id6 } output
 
             }
 

utils/compare_exec_and_2cmc

@@ -18,7 +18,7 @@ env=_"$node"_env.lut
 env_node="$node"_env
 
 
-. /home/jahier/.opam/opam-init/variables.sh
+. $HOME/.opam/opam-init/variables.sh
 set -x verbose #echo on
 
 
@@ -38,8 +38,6 @@ else
 fi
 fi
 
-
-
 if
     ./lus2lic -dir /tmp/lustre-test-$lustre_file-$node $OPT $_oracle -n $oracle  -2c -cc -o $node-oracle.exec;    
 then
@@ -51,12 +49,16 @@ fi
 
 # generated the -2cmc version in $node.exec
 if
-    ./lus2lic -dir /tmp/lustre-test-$lustre_file-$node $OPT $lustre_file -n $node  -2cmc ;
-    lustre-mt /tmp/lustre-test-$lustre_file-$node/${node}_${node}.yml;
-    cp foo_foo_pthread.c /tmp/lustre-test-$lustre_file-$node ;
-    export C_LIBS="-lpthread -lm " ; export MAIN_FILE="foo_foo_pthread.c" ; sh /tmp/lustre-test-$lustre_file-$node/$node.sh
+    ./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 &&
+    mv para.* /tmp/lustre-test-$lustre_file-$node &&
+    mv *env* /tmp/lustre-test-$lustre_file-$node &&
+    mv *oracle* /tmp/lustre-test-$lustre_file-$node &&
+    export C_LIBS="-lpthread -lm " && export MAIN_FILE="${node}_${node}.c" &&
+    cd /tmp/lustre-test-$lustre_file-$node/
+    gcc -o $node.exec ${node}_${node}*.c lustre* para.* $C_LIBS
 then
-    echo "lus2lic -2cmc done"
+    echo "lus2lic -2cmt done"
 else
     echo "Error"
     exit 2