From 953ed8bb2db2ee412fb4a3d1ab70b205cc1299bb Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Mon, 21 Sep 2015 15:29:23 +0200
Subject: [PATCH] non-reg tests: add a couple of lustre files
---
test/lus2lic.sum | 44 ++++++++++++++++++++++++------------
test/should_work/Xr.lus | 21 +++++++++++++++++
test/should_work/real_ex.lus | 5 ++++
3 files changed, 55 insertions(+), 15 deletions(-)
create mode 100644 test/should_work/Xr.lus
create mode 100644 test/should_work/real_ex.lus
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 29c9053c..9e9b5e0b 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Thu Aug 20 10:20:36
+Test Run By jahier on Mon Sep 21 11:20:45
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -64,7 +64,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 Thu Aug 20 10:20:41
+Test Run By jahier on Mon Sep 21 11:20:49
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -396,7 +396,7 @@ PASS: gcc -o multipar.exec multipar_multipar.c multipar_multipar_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test Run By jahier on Thu Aug 20 10:20:36
+Test Run By jahier on Mon Sep 21 11:20:47
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -440,6 +440,9 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c X2.lus {}
PASS: ./lus2lic {-2c X6.lus -n X6}
PASS: gcc -o X6.exec X6_X6.c X6_X6_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c X6.lus {}
+PASS: ./lus2lic {-2c Xr.lus -n Xr}
+PASS: gcc -o Xr.exec Xr_Xr.c Xr_Xr_loop.c
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c Xr.lus {}
PASS: ./lus2lic {-2c nc1.lus -n nc1}
PASS: gcc -o nc1.exec nc1_nc1.c nc1_nc1_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c nc1.lus {}
@@ -574,6 +577,9 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predefOp.lus {}
PASS: ./lus2lic {-2c produitBool.lus -n produitBool}
PASS: gcc -o produitBool.exec produitBool_produitBool.c produitBool_produitBool_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c produitBool.lus {}
+PASS: ./lus2lic {-2c real_ex.lus -n real_ex}
+PASS: gcc -o real_ex.exec real_ex_real_ex.c real_ex_real_ex_loop.c
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c real_ex.lus {}
PASS: ./lus2lic {-2c redIf.lus -n redIf}
PASS: gcc -o redIf.exec redIf_redIf.c redIf_redIf_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c redIf.lus {}
@@ -735,7 +741,7 @@ PASS: gcc -o zzz2.exec zzz2_zzz2.c zzz2_zzz2_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test Run By jahier on Thu Aug 20 10:20:37
+Test Run By jahier on Mon Sep 21 11:20:49
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1237,7 +1243,7 @@ PASS: ./myec2c {-o multipar.c multipar.ec}
PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test Run By jahier on Thu Aug 20 10:20:39
+Test Run By jahier on Mon Sep 21 11:20:51
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1294,6 +1300,10 @@ PASS: ./lus2lic {-o X6.lic X6.lus}
PASS: ./lus2lic {-ec -o X6.ec X6.lus}
PASS: ./myec2c {-o X6.c X6.ec}
PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node X6.lus {}
+PASS: ./lus2lic {-o Xr.lic Xr.lus}
+PASS: ./lus2lic {-ec -o Xr.ec Xr.lus}
+PASS: ./myec2c {-o Xr.c Xr.ec}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node Xr.lus {}
PASS: ./lus2lic {-o nc1.lic nc1.lus}
PASS: ./lus2lic {-ec -o nc1.ec nc1.lus}
PASS: ./myec2c {-o nc1.c nc1.ec}
@@ -1484,6 +1494,10 @@ PASS: ./lus2lic {-o produitBool.lic produitBool.lus}
PASS: ./lus2lic {-ec -o produitBool.ec produitBool.lus}
PASS: ./myec2c {-o produitBool.c produitBool.ec}
PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node produitBool.lus {}
+PASS: ./lus2lic {-o real_ex.lic real_ex.lus}
+PASS: ./lus2lic {-ec -o real_ex.ec real_ex.lus}
+PASS: ./myec2c {-o real_ex.c real_ex.ec}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node real_ex.lus {}
PASS: ./lus2lic {-o redIf.lic redIf.lus}
PASS: ./lus2lic {-ec -o redIf.ec redIf.lus}
PASS: ./myec2c {-o redIf.c redIf.ec}
@@ -1732,7 +1746,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
=== lus2lic2 Summary ===
-# of expected passes 324
+# of expected passes 330
# of unexpected failures 3
==> lus2lic3.sum <==
@@ -1746,18 +1760,18 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
=== lus2lic4 Summary ===
-# of expected passes 463
+# of expected passes 471
# of unexpected failures 4
===============================
# Total number of failures: 23
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 21 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 52 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 16 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 52 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 23 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 50 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 19 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 53 seconds
* Ref time:
-0.05user 0.02system 2:07.25elapsed 0%CPU (0avgtext+0avgdata 5068maxresident)k
-0inputs+0outputs (0major+5541minor)pagefaults 0swaps
+0.03user 0.04system 2:04.05elapsed 0%CPU (0avgtext+0avgdata 5100maxresident)k
+0inputs+0outputs (0major+5545minor)pagefaults 0swaps
* Quick time (-j 4):
-0.02user 0.03system 0:56.39elapsed 0%CPU (0avgtext+0avgdata 5040maxresident)k
-64inputs+0outputs (0major+5561minor)pagefaults 0swaps
+0.04user 0.01system 0:58.69elapsed 0%CPU (0avgtext+0avgdata 5100maxresident)k
+0inputs+0outputs (0major+5583minor)pagefaults 0swaps
diff --git a/test/should_work/Xr.lus b/test/should_work/Xr.lus
new file mode 100644
index 00000000..694a4efb
--- /dev/null
+++ b/test/should_work/Xr.lus
@@ -0,0 +1,21 @@
+node Xr (c: bool; n:real)
+returns (d: bool; m: real; p:real);
+var
+ m_on_c :real when c;
+ p_on_d:real when d;
+
+let
+ assert(c->true);
+ d,m_on_c,p_on_d = X_clk(c, n when c);
+ m = current (m_on_c);
+ p = current (p_on_d);
+tel
+
+node X_clk (c: bool; n:real when c)
+returns (d: bool; m: real when c; p:real when d);
+let
+ m = 0. when c -> pre(m) + n;
+ d = c and (current(m)<=10.);
+ p = 0. when d -> pre(p) + 1. when d;
+tel
+
diff --git a/test/should_work/real_ex.lus b/test/should_work/real_ex.lus
new file mode 100644
index 00000000..a226af25
--- /dev/null
+++ b/test/should_work/real_ex.lus
@@ -0,0 +1,5 @@
+node real_ex (x:real) returns (y:real);
+let
+ y=x;
+tel
+
--
GitLab