Skip to content
Snippets Groups Projects
Commit fd83d811 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

nonreg test: remove some duplicated tests.

parent 61639af4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/Makefile
+ 22
− 0
View file @ fd83d811
......@@ -74,6 +74,28 @@ tmpdirs:
cp -f --preserve=links $(testdir)/* tmp1/ || true
cp -f --preserve=links $(testdir)/* tmp2/ || true
test0: rmlus2lic0.log lus2lic0.log
rmlus2lic0.log:
rm lus2lic0.log
test1: rmlus2lic1.log lus2lic1.log
rmlus2lic1.log:
rm lus2lic1.log
test2: rmlus2lic2.log lus2lic2.log
rmlus2lic2.log:
rm lus2lic2.log
test3: rmlus2lic3.log lus2lic3.log
rmlus2lic3.log:
rm lus2lic3.log
test4: rmlus2lic4.log lus2lic4.log
rmlus2lic4.log:
rm lus2lic4.log
lus2lic0.log:
ssh $(TEST_MACHINE) "cd $(testdir); runtest --tool lus2lic0 lus2lic.tests/test0.exp" || true
......
test/lus2lic.sum
+ 11
− 14
View file @ fd83d811
Test Run By jahier on Fri Aug 22 17:05:48
Test Run By jahier on Fri Aug 22 17:33:17
Native configuration is i686-pc-linux-gnu
=== lus2lic0 tests ===
......@@ -64,7 +64,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/eq1.l
# of expected passes 1
# of expected failures 50
Test Run By jahier on Fri Aug 22 17:05:53
Test Run By jahier on Fri Aug 22 17:34:34
Native configuration is i686-pc-linux-gnu
=== lus2lic1 tests ===
......@@ -118,7 +118,6 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c bred.lus
PASS: ./lus2lic {-2c bad_call03.lus -n bad_call03}
PASS: gcc bad_call03_bad_call03.c bad_call03_bad_call03_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c bad_call03.lus
FAIL: Generate c code : ./lus2lic {-2c bug_map_fby.lus -n bug_map_fby}
PASS: ./lus2lic {-2c bob.lus -n bob}
PASS: gcc bob_bob.c bob_bob_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c bob.lus
......@@ -424,8 +423,8 @@ PASS: ./lus2lic {-2c Int.lus -n Int}
=== lus2lic1 Summary ===
# of expected passes 325
# of unexpected failures 21
Test Run By jahier on Fri Aug 22 17:06:45
# of unexpected failures 20
Test Run By jahier on Fri Aug 22 17:35:34
Native configuration is i686-pc-linux-gnu
=== lus2lic2 tests ===
......@@ -644,8 +643,6 @@ PASS: gcc test_extern_test_extern.c test_extern_test_extern_ext.c test_extern_te
PASS: ./lus2lic {-2c trivial_array.lus -n trivial_array}
PASS: gcc trivial_array_trivial_array.c trivial_array_trivial_array_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c trivial_array.lus
FAIL: Generate c code : ./lus2lic {-2c tranche.lus -n tranche}
FAIL: Check that the generated C code compiles : gcc tranche_tranche.c tranche_tranche_loop.c
PASS: ./lus2lic {-2c t2.lus -n t2}
PASS: gcc t2_t2.c t2_t2_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c t2.lus
......@@ -720,7 +717,6 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz.lus
PASS: ./lus2lic {-2c PCOND1.lus -n PCOND1}
PASS: gcc PCOND1_PCOND1.c PCOND1_PCOND1_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus
FAIL: Generate c code : ./lus2lic {-2c PCOND.lus -n PCOND}
PASS: ./lus2lic {-2c SWITCH.lus -n SWITCH}
PASS: gcc SWITCH_SWITCH.c SWITCH_SWITCH_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c SWITCH.lus
......@@ -741,7 +737,6 @@ PASS: gcc TIME_STABLE_TIME_STABLE.c TIME_STABLE_TIME_STABLE_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c TIME_STABLE.lus
PASS: ./lus2lic {-2c Watch.lus -n Watch}
PASS: gcc Watch_Watch.c Watch_Watch_ext.c Watch_Watch_loop.c
FAIL: Generate c code : ./lus2lic {-2c X6.lus -n X6}
PASS: ./lus2lic {-2c X2.lus -n X2}
PASS: gcc X2_X2.c X2_X2_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c X2.lus
......@@ -752,8 +747,8 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c X.lus
=== lus2lic2 Summary ===
# of expected passes 304
# of unexpected failures 9
Test Run By jahier on Fri Aug 22 17:08:14
# of unexpected failures 5
Test Run By jahier on Fri Aug 22 17:27:00
Native configuration is i686-pc-linux-gnu
=== lus2lic3 tests ===
......@@ -1259,7 +1254,7 @@ PASS: ./myec2c {-o Int.c Int.ec}
# of expected passes 477
# of unexpected failures 14
Test Run By jahier on Fri Aug 22 17:09:12
Test Run By jahier on Fri Aug 22 17:27:06
Native configuration is i686-pc-linux-gnu
=== lus2lic4 tests ===
......@@ -1708,11 +1703,13 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node X.lus
# of expected passes 425
# of unexpected failures 8
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 50 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 89 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 52 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 84 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 56 seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 109 seconds
* Ref time:
0.10user 0.08system 5:13.13elapsed 0%CPU (0avgtext+0avgdata 2464maxresident)k
0inputs+0outputs (0major+12518minor)pagefaults 0swaps
* Quick time (-j 4):
0.09user 0.04system 1:56.55elapsed 0%CPU (0avgtext+0avgdata 2472maxresident)k
0inputs+0outputs (0major+12540minor)pagefaults 0swaps
test/lus2lic.time
+ 4
− 2
View file @ fd83d811
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 50 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 89 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 52 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 84 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 56 seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 109 seconds
* Ref time:
0.10user 0.08system 5:13.13elapsed 0%CPU (0avgtext+0avgdata 2464maxresident)k
0inputs+0outputs (0major+12518minor)pagefaults 0swaps
* Quick time (-j 4):
0.09user 0.04system 1:56.55elapsed 0%CPU (0avgtext+0avgdata 2472maxresident)k
0inputs+0outputs (0major+12540minor)pagefaults 0swaps
test/site.exp
+ 26
− 22
View file @ fd83d811
# Time-stamp: <modified the 22/08/2014 (at 13:42) by Erwan Jahier>
# Time-stamp: <modified the 22/08/2014 (at 17:34) by Erwan Jahier>
#
# (nonreg-)test harness main file
......@@ -207,31 +207,35 @@ proc nonreg_exec_and_2c {files tmp} {
set f [file tail $f]
set node [file tail $f_no_ext]
set id1 [should_work "Generate c code " "$lus2lic" "-2c $f -n $node"]
wait -i $id1
eval spawn "$lus2lic -o $bf.lic $f"
wait -i $spawn_id
if { [nonemptyfile "$bf.lic"] } {
set id1 [should_work "Generate c code " "$lus2lic" "-2c $f -n $node"]
wait -i $id1
if { [nonemptyfile "${node}_${node}.c"] } {
eval spawn "rm -f a.out"
if { [nonemptyfile "${node}_${node}_ext.c"] } {
set id2 [should_work "Check that the generated C code compiles " \
"gcc ${node}_${node}.c ${node}_${node}_ext.c ${node}_${node}_loop.c"]
} else {
set id2 [should_work "Check that the generated C code compiles " \
"gcc ${node}_${node}.c ${node}_${node}_loop.c"]
}
wait -i $id2
catch { exp_close -i $id2 }
catch { exp_wait -i $id2 } output
if { [nonemptyfile "${node}_${node}.c"] } {
eval spawn "rm -f a.out"
if { [nonemptyfile "${node}_${node}_ext.c"] } {
set id2 [should_work "Check that the generated C code compiles " \
"gcc ${node}_${node}.c ${node}_${node}_ext.c ${node}_${node}_loop.c"]
} else {
set id2 [should_work "Check that the generated C code compiles " \
"gcc ${node}_${node}.c ${node}_${node}_loop.c"]
}
wait -i $id2
catch { exp_close -i $id2 }
catch { exp_wait -i $id2 } output
if { [nonemptyfile a.out] && [do_2c_vs_exec "$f"] } {
set id3 [should_work "Try to compare lus2lic -exec and -2c" \
"$compare_exec_and_2c" "$f" "$port"]
catch { exp_close -i $id3 }
catch { exp_wait -i $id3 } output
if { [nonemptyfile a.out] && [do_2c_vs_exec "$f"] } {
set id3 [should_work "Try to compare lus2lic -exec and -2c" \
"$compare_exec_and_2c" "$f" "$port"]
catch { exp_close -i $id3 }
catch { exp_wait -i $id3 } output
}
}
catch { exp_close -i $id1 }
catch { exp_wait -i $id1 } output
}
catch { exp_close -i $id1 }
catch { exp_wait -i $id1 } output
}
return 0
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment