Fix the tests that I've broken in 9028b48e

nb: i should really add 'make test' in the git commit hooks!

Makefile.version.hide

@@ -16,7 +16,7 @@ gen_version:
 
 src/lv6version.ml: Makefile
 	echo "(** Automatically generated from Makefile *) " > $@
-	echo "let tool = \"lus2lic\"" >> $@
+	echo "let tool = \"lv6\"" >> $@
 	echo "let branch = \"$(shell utils/get_branch_name)\"" >> $@
 	echo "let commit = \"$(shell utils/get_commit_number)\"" >> $@
 	echo "let sha_1 = \"$(shell utils/get_sha_1)"\">> $@

src/lv6version.ml

 (** Automatically generated from Makefile *) 
-let tool = "lv6"
+let tool = "lus2lic"
 let branch = "master"
 let commit = "740"
-let sha_1 = "6538b8cc11e3c17178b9a6a8972fdc5fa799661a"
+let sha_1 = "9028b48ed7a2b4c9c62ac8792ca4a15204d05b7c"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"

src/main.ml

-(* Time-stamp: <modified the 01/06/2018 (at 10:26) by Erwan Jahier> *)
+(* Time-stamp: <modified the 03/07/2018 (at 15:28) by Erwan Jahier> *)
 
 open Lv6Verbose
 open AstV6
@@ -304,7 +304,9 @@ let main () = (
           if opt.exec then (
             profile_info "Start interpreting soc...\n";
             SocExec.f opt zesoc msk)
-      ) else if (opt.gen_lic) then (
+      ) else if (
+      opt.gen_lic || global_opt.ec || global_opt.lv4 || global_opt.kcg
+    ) then (
       LicPrg.to_file opt lic_prg main_node
     ) else (
       Printf.printf "\

test/lus2lic.tests/non-reg.exp

@@ -15,7 +15,7 @@ foreach f $ok_files {
     set bf $tmp[file tail $basef]
     set basef [file tail $basef]
 
-    set id1 [should_work "without any option" "$lus2lic" "-o $bf.lic $f"]
+    set id1 [should_work "without any option" "$lus2lic -lic" "-o $bf.lic $bf"]
     wait -i $id1
     # if { [nonemptyfile "$bf.lic"] } {
         set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f"]

test/lus2lic.tests/progression.exp

@@ -26,7 +26,7 @@ proc iter_should_fail { fail_kind } {
     foreach f $files {
         set bf [file rootname $f]
         set bf $tmp[file tail $bf]
-        should_fail "Test bad programs" "$fail_kind" "$lus2lic" "-o $bf.lic $f"
+        should_fail "Test bad programs" "$fail_kind" "$lus2lic -lic" "-o $bf.lic $f"
     }
 }
 

test/myec2c

 #!/bin/sh
 
 
-./ec2c $@  2>&1
+ec2c $@  2>&1

test/should_work/amaury.lus

+
+node amaury_n<<const n:int>>(x: int) returns (y:int);
+let
+   y = with n = 0 then 0 else
+         x + amaury_n<<n-1>>(x);
+tel
+
+node amaury = amaury_n<<4>>;
+

test/should_work/lus2lic

+../../_build/src/main.native
\ No newline at end of file

test/site.exp

-# Time-stamp: <modified the 20/07/2017 (at 14:35) by Erwan Jahier> 
+# Time-stamp: <modified the 03/07/2018 (at 14:49) by Erwan Jahier> 
 # 
 # (nonreg-)test harness main file
 
@@ -236,7 +236,7 @@ proc nonreg_exec_and_2c {files tmp} {
         set node [file tail $f_no_ext]
         set port [get_free_port]
 
-        eval spawn "$lus2lic $opt -o $bf.lic $f"
+        eval spawn "$lus2lic -lic $opt -o $bf.lic $f"
         wait -i $spawn_id
         if { [nonemptyfile "$bf.lic"] &&  [does_not_contain_left_slices "$f"] } {
             set id1 [should_work "Generate c code  " "$lus2lic $opt" "-2c $f -n $node"]
@@ -281,7 +281,7 @@ proc nonreg_exec_and_ecexe {files tmp} {
         set opt [read_opt $f]
         set node [file tail $f_no_ext]
 
-        set id1 [should_work "without any option" "$lus2lic" "$opt" "-o $bf.lic $f"]
+        set id1 [should_work "without any option" "$lus2lic" "$opt" "-lic -o $bf.lic $f"]
         wait -i $id1
         if { [nonemptyfile "$bf.lic"] } {
             set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f"]