Update the nonreg test reference with the new test case (of issue #6)

Makefile.dev

@@ -87,6 +87,7 @@ HTTPTEST=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test
 
 
 OPAM_FILE=$(shell find  $(WWW)/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
+OPAM_FILE_TEST=$(shell find  $(WWW)/test/opam-repository/packages -name opam -cmin -1 | sed -e 's/^./\U&/')
 OPAM_DIR=$(shell dirname $(OPAM_FILE))
 OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lustre-v6
 

_oasis

 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.740
+Version:     1.745
 Synopsis:    The Lustre V6 Verimag compiler
 Description: This package contains:
  - lv6: the (current) name of the compiler (and interpreter via -exec)

src/lv6version.ml

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

test/Makefile

@@ -68,7 +68,7 @@ reftest:
 qtest: 
 	rm -f $(LOG)
 	$(TEST_MACHINE) "cd $(testdir); make tmpdirs"
-	time -o lus2lic.quick_time make -j 8 $(LOG)
+	time -o lus2lic.quick_time make -j 4 $(LOG)
 	cat lus2lic.quick_time
 	make lus2lic.time
 

test/lus2lic.sum

 ==> lus2lic0.sum <==
-Test Run By jahier on Tue Jul  3 16:36:38 
+Test Run By jahier on Wed Jul  4 11:18:08 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
 XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
 
 ==> lus2lic1.sum <==
-Test Run By jahier on Tue Jul  3 16:36:39 
+Test Run By jahier on Wed Jul  4 11:18:09 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -409,7 +409,7 @@ PASS: sh multipar.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus  {}
 
 ==> lus2lic2.sum <==
-Test Run By jahier on Tue Jul  3 16:37:01 
+Test Run By jahier on Wed Jul  4 11:18:30 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -749,7 +749,7 @@ PASS: sh zzz2.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus  {}
 
 ==> lus2lic3.sum <==
-Test Run By jahier on Tue Jul  3 16:37:27 
+Test Run By jahier on Wed Jul  4 11:18:56 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -1103,6 +1103,7 @@ PASS: ./lus2lic {} {-lic -o iterate.lic iterate.lus}
 PASS: ./lus2lic {-ec -o iterate.ec iterate.lus}
 PASS: ./myec2c {-o iterate.c iterate.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iterate.lus {}
+PASS: ./lus2lic { "--expand-nodes -esa"} {-lic -o iterate_on_plus.lic iterate_on_plus.lus}
 PASS: ./lus2lic {} {-lic -o left.lic left.lus}
 PASS: ./lus2lic {-ec -o left.ec left.lus}
 PASS: ./myec2c {-o left.c left.ec}
@@ -1258,7 +1259,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
 
 
 ==> lus2lic4.sum <==
-Test Run By jahier on Tue Jul  3 16:38:06 
+Test Run By jahier on Wed Jul  4 11:19:34 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1763,7 +1764,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 ==> lus2lic3.sum <==
 		=== lus2lic3 Summary ===
 
-# of expected passes		490
+# of expected passes		491
 # of unexpected failures	5
 # of unresolved testcases	1
 
@@ -1776,13 +1777,13 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 ===============================
 # Total number of failures: 15
 lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 22 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 21 seconds
 lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 26 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 39 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 13 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 38 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 14 seconds
 * Ref time: 
-54.46user 14.18system 1:41.04elapsed 67%CPU (0avgtext+0avgdata 280192maxresident)k
-0inputs+139832outputs (0major+9370829minor)pagefaults 0swaps
+53.21user 14.24system 1:39.46elapsed 67%CPU (0avgtext+0avgdata 279824maxresident)k
+0inputs+139824outputs (0major+9375510minor)pagefaults 0swaps
 * Quick time (-j 4):
-61.59user 14.85system 0:53.21elapsed 143%CPU (0avgtext+0avgdata 280548maxresident)k
-0inputs+137016outputs (0major+9206232minor)pagefaults 0swaps
+58.41user 14.51system 0:52.33elapsed 139%CPU (0avgtext+0avgdata 280900maxresident)k
+0inputs+134168outputs (0major+9074499minor)pagefaults 0swaps

test/should_work/iterate_on_plus.lus

+-- nonreg: "--expand-nodes -esa"
 node O(x: bool) returns (y: bool);
 let
    y = false -> pre x; -- y = 0 x
@@ -76,6 +77,6 @@ let
 	z = if timeout then dummy else S[n-1];
 tel
 
-node test = tabtimes<<4,false>>;
+node iterate_on_plus = tabtimes<<4,false>>;