From b5e55fe04f49eef5a6182a8574c8144a5ee7952a Mon Sep 17 00:00:00 2001 From: Erwan Jahier <jahier@imag.fr> Date: Wed, 4 Jul 2018 11:21:48 +0200 Subject: [PATCH] Update the nonreg test reference with the new test case (of issue #6) --- Makefile.dev | 1 + _oasis | 2 +- lv6-ref-man/lv6-ref-man.pdf | Bin 323634 -> 323637 bytes src/lv6version.ml | 6 +++--- test/Makefile | 2 +- test/lus2lic.sum | 27 ++++++++++++++------------- test/should_work/iterate_on_plus.lus | 3 ++- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Makefile.dev b/Makefile.dev index 68cfdc33..9294562c 100644 --- a/Makefile.dev +++ b/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 diff --git a/_oasis b/_oasis index 8e84c155..01d981dd 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ 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) diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf index e755723acbfa65fdca6365c1a00d4f881d92bf44..83adf5af228993292731d7870ef6889590af0c95 100644 GIT binary patch delta 3609 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 delta 3560 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 HjsX1+S3Ff% diff --git a/src/lv6version.ml b/src/lv6version.ml index 8050c50f..52d4bae3 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -1,7 +1,7 @@ (** 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" diff --git a/test/Makefile b/test/Makefile index 0b2eface..92430fb0 100644 --- a/test/Makefile +++ b/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 diff --git a/test/lus2lic.sum b/test/lus2lic.sum index ca7cbe99..f685cf33 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,5 +1,5 @@ ==> 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 diff --git a/test/should_work/iterate_on_plus.lus b/test/should_work/iterate_on_plus.lus index 621e668b..bb06d1b9 100644 --- a/test/should_work/iterate_on_plus.lus +++ b/test/should_work/iterate_on_plus.lus @@ -1,3 +1,4 @@ +-- 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>>; -- GitLab