diff --git a/test/Makefile b/test/Makefile
index fe093a97cbfc30b9ca360e7adf74725ac6b6680b..108cfd365aba700c743dbfaeaac260e07400c55d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,12 @@
-test: runtest lus2lic.diff lus2lic.time
+test: remote-runtest lus2lic.diff lus2lic.time
+
+# to perform the test on the local machine rather than on triglav
+ltest: runtest lus2lic.diff lus2lic.time
testdir=$(shell pwd)
-# XXX remote test should be done using --target_board
+# XXX remote test should be done using --target_board, but i've failed to make it working ...
remote-runtest:
# runtest --all --tool lus2lic --target_board=$(testdir)/board_triglav.exp || true
ssh triglav "cd $(testdir) ; runtest --all --tool lus2lic" || true
@@ -21,6 +24,7 @@ lus2lic.diff:
lus2lic.time:
grep "testcase \./lus2lic" lus2lic.log > lus2lic.time
+ cat lus2lic.time
utest:
cp lus2lic.log lus2lic.log.ref
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 386b6c8a2815a8415be1da8dd216370e9a0fe11b..4541687a72dce22a0a637b456a0d82cd6e4c9f23 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,4 +1,4 @@
-Test Run By jahier on Wed Jan 23 18:39:13 2013
+Test Run By jahier on Fri Jan 25 10:29:53 2013
Native configuration is i686-pc-linux-gnu
=== lus2lic tests ===
diff --git a/test/lus2lic.time b/test/lus2lic.time
index 2a544733b793b903341490be011a958ad645f65e..0be398aed5e1f65d567e9dc3c3f2949e089b19f1 100644
--- a/test/lus2lic.time
+++ b/test/lus2lic.time
@@ -1,2 +1,2 @@
-testcase ./lus2lic.tests/non-reg.exp completed in 112 seconds
-testcase ./lus2lic.tests/progression.exp completed in 1 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 59 seconds
+testcase ./lus2lic.tests/progression.exp completed in 0 seconds
diff --git a/todo.org b/todo.org
index 9f7a8b8ada9eee3adbea9c8aacf36792307718de..8c3cac8d3eb6c3f197a28d18dc9b0ca36ab1c452 100644
--- a/todo.org
+++ b/todo.org
@@ -91,20 +91,20 @@ file:test/should_fail/type/parametric_node.lus
- State "TODO" from "" [2013-01-19 Sat 09:43]
./lus2lic { -o /tmp/packages.out should_work/broken/packages.lus}
./lus2lic -ec -o /tmp/packages.ec should_work/broken/packages.lus
- Error in file "/home/jahier/lus2lic/test/should_work/broken/packages.lus", line 22, col 27 to 29, token 'int':
+ Error in file "/home/jahier/lus2lic/test/should_work/broken/packages.lus", line 22, col 27 to 29, token 'int':
syntax error
file:test/should_work/broken/packages.lus::22
-** TODO instanciation de noeuds ne marche pas ?
+** TODO instanciation de noeuds ne marche pas ?
- State "TODO" from "" [2013-01-19 Sat 10:02]
./lus2lic -o /tmp/multipar.out should_work/broken/multipar.lus
file:test/should_work/broken/multipar.lus::20
- Error in file "/home/jahier/lus2lic/test/should_work/broken/multipar.lus", line 20, col 12 to 12, token 'g':
- unknown node: g
- known nodes are: sil, bok, gup, lis
+ Error in file "/home/jahier/lus2lic/test/should_work/broken/multipar.lus", line 20, col 12 to 12, token 'g':
+ unknown node: g
+ known nodes are: sil, bok, gup, lis
-FAIL: without any option: ./lus2lic { -o /tmp/multipar.out should_work/broken/multipar.lus}
+FAIL: without any option: ./lus2lic { -o /tmp/multipar.out should_work/broken/multipar.lus}
** TODO Revoir le nommage des instances de noeuds parametriques
par ex, pour should_work/NONREG/param_struct.lus
ca invente des noms bien débiles du point de vue du nom du pack.
@@ -147,6 +147,7 @@ du coup les stats sont un peu fausses. a revoir.
par ex file:test/should_fail/semantics/sincos.lus n'echoue qu'en mode -ec
(et pour l'instant il n'est testé qu'en mode lic)
+
* Aesthetes issues
** TODO Nommage des variables fraiches : Reprendre LicVarName.ml
- State "TODO" from "" [2013-01-16 Wed 18:03]
@@ -166,26 +167,20 @@ QU: Pascal l'a fait ?
* Languages issues
-** TODO Verifier les boucles combinatoires
-quand on genere du ec (car ec2c ne fait pas la verif !)
- [2010-06-07 Mon]
-
-On pourrait peut-etre le faire en modifiant celui la : file:src/l2lCheckOutputs.ml ?
** TODO Verifier les boucles combinatoires meme quand on ne genere pas de ec
On pourrait utiliser file:src/misc.ml pour prendre finement en compte les
struct et les arrays.
-
** TODO Merge is not working
** TODO Condact is not working
file:test/should_work/broken/cond01.lus
- State "TODO" from "" [2013-01-18 Fri 23:18]
- ./lus2lic -ec -o /tmp/cond01.ec should_work/broken/cond01.lus
+ ./lus2lic -ec -o /tmp/cond01.ec should_work/broken/cond01.lus
- oops: lus2lic internal error
- File "objlinux/l2lExpandMetaOp.ml", line 310, column 4
- when compiling lustre program should_work/broken/cond01.lus
+ oops: lus2lic internal error
+ File "objlinux/l2lExpandMetaOp.ml", line 310, column 4
+ when compiling lustre program should_work/broken/cond01.lus
** TODO Rajouter le with à la caml pour les structures
- State "TODO" from "" [2012-10-26 Fri 14:59]
diff --git a/todo.org_archive b/todo.org_archive
index 439d84145be89bbb5f3035fabe654f3f501588d2..2b0b054da7317f75f732ba153986b5f29ca43c23 100644
--- a/todo.org_archive
+++ b/todo.org_archive
@@ -264,6 +264,19 @@ car c'est plus facile dans git pour retrouver ses petits
:ARCHIVE_TODO: TODO
:END:
[2010-11-08 Mon]
+* TODO Verifier les boucles combinatoires
+ :PROPERTIES:
+ :ARCHIVE_TIME: 2013-01-24 Thu 09:13
+ :ARCHIVE_FILE: ~/lus2lic/todo.org
+ :ARCHIVE_OLPATH: Languages issues
+ :ARCHIVE_CATEGORY: lv6
+ :ARCHIVE_TODO: TODO
+ :END:
+quand on genere du ec (car ec2c ne fait pas la verif !)
+ [2010-06-07 Mon]
+
+On pourrait peut-etre le faire en modifiant celui la : file:src/l2lCheckOutputs.ml ?
+