non-reg tests: try to remove tests that fail for bad reasons.

For instance, do not launch tests that perform result comparison (via
lurette) on files that contains extern nodes (as they cannot be
executed) or package.  Package do not work because appending the
tested lustre file with the generated oracle as I do is wrong in
presence of package.

Moreover, my current test process is not able to test programs which
main node IOs are not all on the base clock. I have fixed this by
patching the examples.

# of expected passes 		1508 -> 1512
# of unexpected failures	130 -> 84

test/should_work/test_merge.lus

 type piece = enum { Pile, Face, Tranche }; ---
 node test_merge(clk: piece; ---
+   i1 : int ; 
+   i2 : int; 
+   i3 : int) 
+returns (y: int); ---
+  let
+  y = test_merge_clk(clk,i1 when Pile(clk), i2 when Face(clk), i3 when Tranche(clk));
+  tel
+ 
+
+node test_merge_clk(clk: piece; ---
    i1 : int when Pile(clk) ; 
    i2 : int when Face(clk); 
    i3 : int when Tranche(clk)) 

test/site.exp

@@ -130,11 +130,34 @@ proc nonemptyfile {filename} {
 
 package require fileutil
 
-proc contains_extern {f} {
-
-    set pattern {extern}    
-    set match  [llength [fileutil::grep $pattern $f]]
-    return [expr {$match == 0 }]
+# test if file $f contain the string $str
+proc does_not_contain_string {f str} {
+    set occ  [llength [fileutil::grep $str $f]]
+    if { ($occ == 1 ) } { puts " $f contains $occ occurence of $str" }
+    if { ($occ > 1 ) } { puts " $f contains $occ occurence(s) of $str" }
+    return [expr { $occ == 0 }]
 }
 
+# do no try to use lurette on files that contains extern nodes or package.
+# Package won't work  because appending the tested lustre file with the 
+# generated oracle as I do is wrong in presence of package (fixme)
+proc do_ecexe_vs_exec {f} {
+    if { 
+        [does_not_contain_string "$f" "enum "] &&
+        [does_not_contain_string "$f" "extern"] &&
+        [does_not_contain_string "$f" "package"] 
+    } { 
+        return 1
+    }
+    return 0
+}
 
+proc do_2c_vs_exec {f} {
+    if { 
+        [does_not_contain_string "$f" "extern"] &&
+        [does_not_contain_string "$f" "package"] 
+    } { 
+        return 1
+    }
+    return 0
+}

todo.org

@@ -102,39 +102,91 @@ et que ca marche tres bien. Ce qui prouve bien que ca ne sert a rien cette affai
 ** TODO divergence -exec et -2c
    - State "TODO"       from ""           [2014-07-11 Fri 12:02]
 
+grep "FAIL:" lus2lic.log | grep "exec" | grep "\-2c" | sed s/'FAIL: Try to compare lus2lic -exec and -2c:'/-/
 
 1. ../utils/compare_exec_and_2c should_work/ck5.lus
-2. ../utils/compare_exec_and_2c should_work/testPilote.lus
-3. ../utils/compare_exec_and_2c should_work/testCapt.lus
-4. ../utils/compare_exec_and_2c should_work/test_node_expand2.lus
-5. ../utils/compare_exec_and_2c should_work/test_node_expand.lus
-6. ../utils/compare_exec_and_2c should_work/X6.lus
-7. ../utils/compare_exec_and_2c should_work/sincos.lus
-8. ../utils/compare_exec_and_2c should_work/clock_ite.lus
-9. ../utils/compare_exec_and_2c should_work/integrator.lus
-10. ../utils/compare_exec_and_2c should_work/complex.lus
-11. ../utils/compare_exec_and_2c should_work/PCOND1.lus
-12. ../utils/compare_exec_and_2c should_work/lustre_test1_ok.lus
-13. ../utils/compare_exec_and_2c should_work/sample_time_change.lus
-14. ../utils/compare_exec_and_2c should_work/CURRENT.lus
-15. ../utils/compare_exec_and_2c should_work/multiclock.lus
-16. ../utils/compare_exec_and_2c should_work/TIME_STABLE.lus
-17. ../utils/compare_exec_and_2c should_work/multipar.lus
-18. ../utils/compare_exec_and_2c should_work/pack1.lus
-19. ../utils/compare_exec_and_2c should_work/bob.lus
-20. ../utils/compare_exec_and_2c should_work/test_condact.lus
-21. ../utils/compare_exec_and_2c should_work/ck4.lus
-22. ../utils/compare_exec_and_2c should_work/filliter.lus
-23. ../utils/compare_exec_and_2c should_work/X2.lus
-24. ../utils/compare_exec_and_2c should_work/hanane.lus
-25. ../utils/compare_exec_and_2c should_work/ck3.lus
-26. ../utils/compare_exec_and_2c should_work/ck7.lus
-27. ../utils/compare_exec_and_2c should_work/PCOND.lus
-28. ../utils/compare_exec_and_2c should_work/ck2.lus
-29. ../utils/compare_exec_and_2c should_work/X.lus
-30. ../utils/compare_exec_and_2c should_work/clock1_2ms.lus
+  -> erreur de clock !
 
+2. ../utils/compare_exec_and_2c should_work/test_node_expand2.lus
+  -> -2110104000 est n'est pas un entier acceptable pour lutin sur les machines 32 bits...
 
+3. ../utils/compare_exec_and_2c should_work/test_node_expand.lus
+  -> idem
+
+4. ../utils/compare_exec_and_2c should_work/sincos.lus
+  -> une erreur en mode -exec au step 2 (nil)
+
+5. ../utils/compare_exec_and_2c should_work/clock_ite.lus
+  -> pb!
+
+6. ../utils/compare_exec_and_2c should_work/integrator.lus
+  -> pb d'arrondi (1305025.02198 vs 1305025.)
+
+7. ../utils/compare_exec_and_2c should_work/PCOND1.lus
+   -> pb d'arrondi / 32bits
+
+8. ../utils/compare_exec_and_2c should_work/CURRENT.lus
+   -> manisfestement, le comportement du current diverge...
+
+9. ../utils/compare_exec_and_2c should_work/TIME_STABLE.lus
+  -> pb!
+
+10. ../utils/compare_exec_and_2c should_work/multipar.lus
+   -> pb d'arrondi / 32bits
+
+11. ../utils/compare_exec_and_2c should_work/bob.lus
+    -> manisfestement, le comportement du current diverge...
+
+12. ../utils/compare_exec_and_2c should_work/test_condact.lus
+   -> pb!
+
+13. ../utils/compare_exec_and_2c should_work/array_concat.lus
+   -> le a.out fait un segmentation fault
+
+14. ../utils/compare_exec_and_2c should_work/ck4.lus
+    -> manisfestement, le comportement du current diverge...
+
+15. ../utils/compare_exec_and_2c should_work/filliter.lus
+    -> manisfestement, le comportement du current diverge...
+
+16. ../utils/compare_exec_and_2c should_work/X2.lus
+   -> pb!
+
+17. ../utils/compare_exec_and_2c should_work/hanane.lus
+    -> manisfestement, le comportement du current diverge...
+
+18. ../utils/compare_exec_and_2c should_work/ck3.lus
+    -> manisfestement, le comportement du current diverge...
+
+19. ../utils/compare_exec_and_2c should_work/ck2.lus
+    -> manisfestement, le comportement du current diverge...
+
+
+** TODO Divergences -exec et ecexe
+   - State "TODO"       from ""           [2014-07-11 Fri 16:54]
+
+ grep "FAIL:" lus2lic.log | grep "exec" | grep "ecexe" | sed s/'FAIL: Try to compare lus2lic -exec and ecexe:'/-/
+
+1. ../utils/test_lus2lic_no_node should_work/Gyroscope2.lus
+2. ../utils/test_lus2lic_no_node should_work/test_node_expand2.lus
+3. ../utils/test_lus2lic_no_node should_work/test_node_expand.lus
+4. ../utils/test_lus2lic_no_node should_work/modes3x2_v2.lus
+5. ../utils/test_lus2lic_no_node should_work/X6.lus
+6. ../utils/test_lus2lic_no_node should_work/filter.lus
+7. ../utils/test_lus2lic_no_node should_work/sincos.lus
+8. ../utils/test_lus2lic_no_node should_work/integrator.lus
+9. ../utils/test_lus2lic_no_node should_work/PCOND1.lus
+10. ../utils/test_lus2lic_no_node should_work/multiclock.lus
+11. ../utils/test_lus2lic_no_node should_work/multipar.lus
+12. ../utils/test_lus2lic_no_node should_work/activation2.lus
+13. ../utils/test_lus2lic_no_node should_work/bob.lus
+14. ../utils/test_lus2lic_no_node should_work/test_condact.lus
+15. ../utils/test_lus2lic_no_node should_work/activation1.lus
+16. ../utils/test_lus2lic_no_node should_work/Gyroscope.lus
+17. ../utils/test_lus2lic_no_node should_work/hanane.lus
+18. ../utils/test_lus2lic_no_node should_work/cond01.lus
+19. ../utils/test_lus2lic_no_node should_work/speedcontrol.lus
+20. ../utils/test_lus2lic_no_node should_work/PCOND.lus
 
 
 * Packages, modeles, etc.

utils/compare_exec_and_2c

@@ -39,7 +39,7 @@ else
     exit 2
 fi
 
-PORT=2000
+PORT=2001
 ./call-via-socket -server -addr 127.0.0.1 -port $PORT ./a.out &
 
 export PATH=/usr/local/tools/lustre/bin/:$PATH