Merge: Cleanup tests

Cleanup in existing tests. Especially in the `fixme` category.

Pull-Request: #900
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/tests/base_init_linext.nit b/tests/base_init_linext.nit
index ac93fb4..ac1d618 100644 (file)
--- a/tests/base_init_linext.nit
+++ b/tests/base_init_linext.nit
@@ -31,7 +31,7 @@ class B
                'B'.output
                '1'.output
                ' '.output
-               inita
+               super
                'B'.output
                '2'.output
                ' '.output
@@ -45,7 +45,7 @@ class C
                'C'.output
                '1'.output
                ' '.output
-               inita
+               super
                'C'.output
                '2'.output
                ' '.output
@@ -58,52 +58,12 @@ class D
        super C
        init do
                'D'.output
-               '0'.output
-               ' '.output
-#alt1#         inita
-#alt3#         inita
-#alt5#         inita
-#alt7#         inita
-#alt9#         inita
-#alt11#                inita
-#alt13#                inita
-#alt15#                inita
-               'D'.output
                '1'.output
                ' '.output
-#alt2#         initb
-#alt3#         initb
-#alt6#         initb
-#alt7#         initb
-#alt10#                initb
-#alt11#                initb
-#alt14#                initb
-#alt15#                initb
+               super
                'D'.output
                '2'.output
                ' '.output
-#alt4#         initc
-#alt5#         initc
-#alt6#         initc
-#alt7#         initc
-#alt12#                initc
-#alt13#                initc
-#alt14#                initc
-#alt15#                initc
-               'D'.output
-               '3'.output
-               ' '.output
-#alt8#         inite
-#alt9#         inite
-#alt10#                inite
-#alt11#                inite
-#alt12#                inite
-#alt13#                inite
-#alt14#                inite
-#alt15#                inite
-               'D'.output
-               '4'.output
-               ' '.output
        end
 
        init inite do

diff --git a/tests/base_init_linext2.nit b/tests/base_init_linext2.nit
index 7b5bfc4..aa032c0 100644 (file)
--- a/tests/base_init_linext2.nit
+++ b/tests/base_init_linext2.nit
@@ -68,7 +68,7 @@ class C
                'C'.output
                '1'.output
                ' '.output
-               inita
+               super
                'C'.output
                '2'.output
                ' '.output

diff --git a/tests/cc.skip b/tests/cc.skip
index 2e20b7e..93a2d8f 100644 (file)
--- a/tests/cc.skip
+++ b/tests/cc.skip
@@ -1,10 +1,3 @@
 bcm2835
-gtk3_6
-gtk3_8
-posix_ext
-physical_interface_for_mpd_on_rpi
 blink
 input
-android_app
-android_assets
-opengles1

diff --git a/tests/emscripten.skip b/tests/emscripten.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/emscripten.skip
+++ b/tests/emscripten.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/error_prop_loc.nit b/tests/error_prop_loc.nit
index b74fc3c..4872f08 100644 (file)
--- a/tests/error_prop_loc.nit
+++ b/tests/error_prop_loc.nit
@@ -14,22 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import end
-class Object
-end
+import kernel
 
 class A
-       fun toto do end
+       fun toto do 1.output
 end
 class B
        super A
-       redef fun toto do end
+       redef fun toto do 2.output
 end
 class C
        super A
-       redef fun toto do end
+       redef fun toto do 3.output
 end
 class D
        super B
        super C
 end
+
+(new A).toto
+(new B).toto
+(new C).toto
+#alt1#(new D).toto

diff --git a/tests/nitg-e.skip b/tests/nitg-e.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/nitg-e.skip
+++ b/tests/nitg-e.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/nitg-g.skip b/tests/nitg-g.skip
index fb091a0..7175bb7 100644 (file)
--- a/tests/nitg-g.skip
+++ b/tests/nitg-g.skip
@@ -1,3 +1,2 @@
-init_inherit
-init_linext
 nitg
+nitdoc

diff --git a/tests/nitg-s.skip b/tests/nitg-s.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/nitg-s.skip
+++ b/tests/nitg-s.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/nitg-sg.skip b/tests/nitg-sg.skip
index 5f17ed8..e69de29 100644 (file)
--- a/tests/nitg-sg.skip
+++ b/tests/nitg-sg.skip
@@ -1,3 +0,0 @@
-init_inherit
-init_linext
-android

diff --git a/tests/niti.skip b/tests/niti.skip
index baf5b76..1fec913 100644 (file)
--- a/tests/niti.skip
+++ b/tests/niti.skip
@@ -1,5 +1,3 @@
-init_inherit
-init_linext
 test_mem
 shoot_logic
 bench_
@@ -16,7 +14,6 @@ nitg_args6
 nitg_args8
 test_markdown_args1
 pep8analysis
-nitcc_parser_gen
 emscripten
 nitserial_args
 nitunit_args

diff --git a/tests/nitvm.skip b/tests/nitvm.skip
index afed2b6..da1d367 100644 (file)
--- a/tests/nitvm.skip
+++ b/tests/nitvm.skip
@@ -1,5 +1,3 @@
-init_inherit
-init_linext
 test_mem
 shoot_logic
 bench_

diff --git a/tests/sav/base_init_inherit.res b/tests/sav/base_init_inherit.res
index 04165c5..2240200 100644 (file)
--- a/tests/sav/base_init_inherit.res
+++ b/tests/sav/base_init_inherit.res
@@ -4,5 +4,5 @@ B{A}ba
 C{B{A}}cba
 Ama
 A2ma
-B{A}nbma
-O{C{B{A}}}onmcba
+B{A}nmba
+O{C{B{A}}}oncmba

diff --git a/tests/sav/base_init_inherit2_alt0.res b/tests/sav/base_init_inherit2_alt0.res
index 0212e99..6717ee4 100644 (file)
--- a/tests/sav/base_init_inherit2_alt0.res
+++ b/tests/sav/base_init_inherit2_alt0.res
@@ -2,4 +2,4 @@ Aa
 Aba
 Aca
 Amca
-Anbmca
+Anmcba

diff --git a/tests/sav/base_init_inherit2_alt1.res b/tests/sav/base_init_inherit2_alt1.res
index 3868b73..4e63661 100644 (file)
--- a/tests/sav/base_init_inherit2_alt1.res
+++ b/tests/sav/base_init_inherit2_alt1.res
@@ -2,4 +2,4 @@ Aa
 B{A}ba
 Aca
 Amca
-B{A}nbmca
+B{A}nmcba

diff --git a/tests/sav/base_init_inherit2_alt2.res b/tests/sav/base_init_inherit2_alt2.res
index 5bb2c66..5707297 100644 (file)
--- a/tests/sav/base_init_inherit2_alt2.res
+++ b/tests/sav/base_init_inherit2_alt2.res
@@ -2,4 +2,4 @@ Aa
 Aba
 C{A}ca
 C{A}mca
-C{A}nbmca
+C{A}nmcba

diff --git a/tests/sav/base_init_inherit2_alt3.res b/tests/sav/base_init_inherit2_alt3.res
index bf88578..863486b 100644 (file)
--- a/tests/sav/base_init_inherit2_alt3.res
+++ b/tests/sav/base_init_inherit2_alt3.res
@@ -1 +1 @@
-alt/base_init_inherit2_alt3.nit:75,7: Error: Explicit constructor required in N since multiple inheritance of constructor is forbiden. Conflicting classes are B, C. Costructors are base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::A::ca, base_init_inherit2_alt3::C::cc.
+Aa

diff --git a/tests/sav/base_init_inherit3_alt0.res b/tests/sav/base_init_inherit3_alt0.res
index 9a3590f..d25bc4f 100644 (file)
--- a/tests/sav/base_init_inherit3_alt0.res
+++ b/tests/sav/base_init_inherit3_alt0.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qmbna
+B{A}obma
+B{A}pnba
+B{A}qnbma

diff --git a/tests/sav/base_init_inherit3_alt1.res b/tests/sav/base_init_inherit3_alt1.res
index 3a08969..3aef777 100644 (file)
--- a/tests/sav/base_init_inherit3_alt1.res
+++ b/tests/sav/base_init_inherit3_alt1.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qombna
+B{A}obma
+B{A}pnba
+B{A}qonbma

diff --git a/tests/sav/base_init_inherit3_alt2.res b/tests/sav/base_init_inherit3_alt2.res
index 77e587f..340bcfd 100644 (file)
--- a/tests/sav/base_init_inherit3_alt2.res
+++ b/tests/sav/base_init_inherit3_alt2.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qmpbna
+B{A}obma
+B{A}pnba
+B{A}qpnbma

diff --git a/tests/sav/base_init_inherit3_alt3.res b/tests/sav/base_init_inherit3_alt3.res
index 7293394..486e174 100644 (file)
--- a/tests/sav/base_init_inherit3_alt3.res
+++ b/tests/sav/base_init_inherit3_alt3.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qompbna
+B{A}obma
+B{A}pnba
+B{A}qponbma

diff --git a/tests/sav/base_init_inherit4_alt0.res b/tests/sav/base_init_inherit4_alt0.res
index 1df3160..b14d378 100644 (file)
--- a/tests/sav/base_init_inherit4_alt0.res
+++ b/tests/sav/base_init_inherit4_alt0.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqmbna
+Bobma
+Bpnba
+Bqnbma

diff --git a/tests/sav/base_init_inherit4_alt1.res b/tests/sav/base_init_inherit4_alt1.res
index 1b94fae..5fa8ab0 100644 (file)
--- a/tests/sav/base_init_inherit4_alt1.res
+++ b/tests/sav/base_init_inherit4_alt1.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqombna
+Bobma
+Bpnba
+Bqonbma

diff --git a/tests/sav/base_init_inherit4_alt2.res b/tests/sav/base_init_inherit4_alt2.res
index 5d31ef6..652e57b 100644 (file)
--- a/tests/sav/base_init_inherit4_alt2.res
+++ b/tests/sav/base_init_inherit4_alt2.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqmpbna
+Bobma
+Bpnba
+Bqpnbma

diff --git a/tests/sav/base_init_inherit4_alt3.res b/tests/sav/base_init_inherit4_alt3.res
index 65961af..d7b2cd6 100644 (file)
--- a/tests/sav/base_init_inherit4_alt3.res
+++ b/tests/sav/base_init_inherit4_alt3.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqompbna
+Bobma
+Bpnba
+Bqponbma

diff --git a/tests/sav/base_init_inherit5.res b/tests/sav/base_init_inherit5.res
index c67526f..246f558 100644 (file)
--- a/tests/sav/base_init_inherit5.res
+++ b/tests/sav/base_init_inherit5.res
@@ -2,5 +2,5 @@ A1a
 B2{A1}ba
 C3{B2{A1}}cba
 A1ma
-B2{A1}nbma
-O4{C3{B2{A1}}}onmcba
+B2{A1}nmba
+O4{C3{B2{A1}}}oncmba

diff --git a/tests/sav/base_init_inherit6_alt1.res b/tests/sav/base_init_inherit6_alt1.res
index 893493f..a912b09 100644 (file)
--- a/tests/sav/base_init_inherit6_alt1.res
+++ b/tests/sav/base_init_inherit6_alt1.res
@@ -1 +1,5 @@
-alt/base_init_inherit6_alt1.nit:32,10--14: Error: init is not a constructor in B.
+1
+2
+1
+3
+1

diff --git a/tests/sav/base_init_inherit6_alt2.res b/tests/sav/base_init_inherit6_alt2.res
index 900503c..ce7a77e 100644 (file)
--- a/tests/sav/base_init_inherit6_alt2.res
+++ b/tests/sav/base_init_inherit6_alt2.res
@@ -1 +1,5 @@
-alt/base_init_inherit6_alt2.nit:33,10--18: Error: foo is not a constructor in B.
+1
+2
+1
+3
+2

diff --git a/tests/sav/base_init_inherit_alt1.res b/tests/sav/base_init_inherit_alt1.res
index a63698b..1243025 100644 (file)
--- a/tests/sav/base_init_inherit_alt1.res
+++ b/tests/sav/base_init_inherit_alt1.res
@@ -1,11 +1,19 @@
-alt/base_init_inherit_alt1.nit:95,2--9: Error: ca is not a constructor in B.
-alt/base_init_inherit_alt1.nit:96,2--10: Error: ca2 is not a constructor in B.
-alt/base_init_inherit_alt1.nit:98,2--9: Error: ca is not a constructor in C.
-alt/base_init_inherit_alt1.nit:99,2--10: Error: ca2 is not a constructor in C.
-alt/base_init_inherit_alt1.nit:100,2--9: Error: cb is not a constructor in C.
-alt/base_init_inherit_alt1.nit:104,2--9: Error: ca is not a constructor in N.
-alt/base_init_inherit_alt1.nit:105,2--10: Error: ca2 is not a constructor in N.
-alt/base_init_inherit_alt1.nit:107,2--9: Error: ca is not a constructor in O.
-alt/base_init_inherit_alt1.nit:108,2--10: Error: ca2 is not a constructor in O.
-alt/base_init_inherit_alt1.nit:109,2--9: Error: cb is not a constructor in O.
-alt/base_init_inherit_alt1.nit:110,2--9: Error: cc is not a constructor in O.
+Aa
+A2a
+B{A}ba
+Aba
+A2ba
+C{B{A}}cba
+Acba
+A2cba
+B{A}cba
+Ama
+A2ma
+B{A}nmba
+Anmba
+A2nmba
+O{C{B{A}}}oncmba
+Aoncmba
+A2oncmba
+B{A}oncmba
+C{B{A}}oncmba

diff --git a/tests/sav/base_init_linext.res b/tests/sav/base_init_linext.res
index 6f74ed3..b0e29f8 100644 (file)
--- a/tests/sav/base_init_linext.res
+++ b/tests/sav/base_init_linext.res
@@ -1 +1 @@
-B1 A B2 C1 C2 D0 D1 D2 D3 D4 
+D1 C1 B1 A B2 C2 D2 

diff --git a/tests/sav/base_init_linext2.res b/tests/sav/base_init_linext2.res
index c12605c..daa73b2 100644 (file)
--- a/tests/sav/base_init_linext2.res
+++ b/tests/sav/base_init_linext2.res
@@ -3,6 +3,6 @@ A2x
 B1 A B2 
 A B3 
 A B4y 
-C1 A C2 
+C1 C2 
 A2z C3z 
-D1 B1 A B2 C1 C2 D2 D3 
+D1 B1 A B2 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt1.res b/tests/sav/base_init_linext2_alt1.res
index 1b64c0f..fc63fc7 100644 (file)
--- a/tests/sav/base_init_linext2_alt1.res
+++ b/tests/sav/base_init_linext2_alt1.res
@@ -1 +1 @@
-alt/base_init_linext2_alt1.nit:100,1--5: Error: No contructor named initd in superclasses.
+alt/base_init_linext2_alt1.nit:100,1--5: Error: No super method to call for initd.

diff --git a/tests/sav/base_init_linext2_alt2.res b/tests/sav/base_init_linext2_alt2.res
index c7c14d4..fe7551d 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.res
+++ b/tests/sav/base_init_linext2_alt2.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt2.nit:99,2--5: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(c: Char).
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+C1 C2 D1 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt3.res b/tests/sav/base_init_linext2_alt3.res
index 924b31d..7eadb94 100644 (file)
--- a/tests/sav/base_init_linext2_alt3.res
+++ b/tests/sav/base_init_linext2_alt3.res
@@ -3,6 +3,6 @@ A2x
 B1 A B2 
 A B3 
 A B4y 
-C1 A C2 
+C1 C2 
 A2z C3z 
 D1 B1 A B2 D2 C1 C2 D3 

diff --git a/tests/sav/base_init_linext2_alt4.res b/tests/sav/base_init_linext2_alt4.res
index 1bd61e3..9bc59e1 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.res
+++ b/tests/sav/base_init_linext2_alt4.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt4.nit:99,2--5: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(c: Char).
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+D1 C1 C2 B1 A B2 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt5.res b/tests/sav/base_init_linext2_alt5.res
index d04a73a..bc59762 100644 (file)
--- a/tests/sav/base_init_linext2_alt5.res
+++ b/tests/sav/base_init_linext2_alt5.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt5.nit:109,1--5: Error: Only one super constructor invocation of class B is allowed.
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+D1 B1 A B2 D2 B1 A B2 D3 

diff --git a/tests/sav/base_init_linext_alt0.res b/tests/sav/base_init_linext_alt0.res
index 90938b0..6d4b14b 100644 (file)
--- a/tests/sav/base_init_linext_alt0.res
+++ b/tests/sav/base_init_linext_alt0.res
@@ -1,5 +1,5 @@
 A 
 B1 A B2 
 C1 A C2 
-B1 A B2 C1 C2 D0 D1 D2 D3 D4 
-E1 A E2 B1 B2 E3 C1 C2 E4 
+D1 C1 B1 A B2 C2 D2 
+E1 D1 C1 B1 A B2 C2 D2 E2 D1 C1 B1 A B2 C2 D2 E3 D1 C1 B1 A B2 C2 D2 E4 

diff --git a/tests/sav/base_init_linext_alt1.res b/tests/sav/base_init_linext_alt1.res
deleted file mode 100644 (file)
index 04e3275..0000000
--- a/tests/sav/base_init_linext_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A B1 B2 C1 C2 D1 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt10.res b/tests/sav/base_init_linext_alt10.res
deleted file mode 100644 (file)
index 683e93c..0000000
--- a/tests/sav/base_init_linext_alt10.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 D3 E1 E2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt11.res b/tests/sav/base_init_linext_alt11.res
deleted file mode 100644 (file)
index edef552..0000000
--- a/tests/sav/base_init_linext_alt11.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 D3 E1 E2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt12.res b/tests/sav/base_init_linext_alt12.res
deleted file mode 100644 (file)
index a92a06b..0000000
--- a/tests/sav/base_init_linext_alt12.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 D2 C1 A C2 D3 E1 E2 B1 B2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt13.res b/tests/sav/base_init_linext_alt13.res
deleted file mode 100644 (file)
index cea7bbd..0000000
--- a/tests/sav/base_init_linext_alt13.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 D2 C1 C2 D3 E1 E2 B1 B2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt14.res b/tests/sav/base_init_linext_alt14.res
deleted file mode 100644 (file)
index ce9cfc0..0000000
--- a/tests/sav/base_init_linext_alt14.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 C1 C2 D3 E1 E2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt15.res b/tests/sav/base_init_linext_alt15.res
deleted file mode 100644 (file)
index d48d0e2..0000000
--- a/tests/sav/base_init_linext_alt15.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 C1 C2 D3 E1 E2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt2.res b/tests/sav/base_init_linext_alt2.res
deleted file mode 100644 (file)
index 0d383df..0000000
--- a/tests/sav/base_init_linext_alt2.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 C1 C2 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt3.res b/tests/sav/base_init_linext_alt3.res
deleted file mode 100644 (file)
index 539f8ad..0000000
--- a/tests/sav/base_init_linext_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 C1 C2 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt4.res b/tests/sav/base_init_linext_alt4.res
deleted file mode 100644 (file)
index 2aa8b4e..0000000
--- a/tests/sav/base_init_linext_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-B1 A B2 D0 D1 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt5.res b/tests/sav/base_init_linext_alt5.res
deleted file mode 100644 (file)
index 7883af4..0000000
--- a/tests/sav/base_init_linext_alt5.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A B1 B2 D1 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt6.res b/tests/sav/base_init_linext_alt6.res
deleted file mode 100644 (file)
index ce5e04a..0000000
--- a/tests/sav/base_init_linext_alt6.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt7.res b/tests/sav/base_init_linext_alt7.res
deleted file mode 100644 (file)
index c075e86..0000000
--- a/tests/sav/base_init_linext_alt7.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt8.res b/tests/sav/base_init_linext_alt8.res
deleted file mode 100644 (file)
index 305d19c..0000000
--- a/tests/sav/base_init_linext_alt8.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 D2 D3 E1 A E2 B1 B2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt9.res b/tests/sav/base_init_linext_alt9.res
deleted file mode 100644 (file)
index 322c6ab..0000000
--- a/tests/sav/base_init_linext_alt9.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 D2 D3 E1 E2 B1 B2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_raf.res b/tests/sav/base_init_linext_raf.res
index 2d4d642..27671d4 100644 (file)
--- a/tests/sav/base_init_linext_raf.res
+++ b/tests/sav/base_init_linext_raf.res
@@ -1,4 +1,4 @@
 A 
 b1 B1 A B2 b2 
 c1 C1 A C2 c2 
-d1 b1 B1 A B2 b2 c1 C1 C2 c2 D0 D1 D2 D3 D4 d2 
+d1 D1 c1 C1 b1 B1 A B2 b2 C2 c2 D2 d2 

diff --git a/tests/sav/error_prop_loc.res b/tests/sav/error_prop_loc.res
index 6a6e994..01e79c3 100644 (file)
--- a/tests/sav/error_prop_loc.res
+++ b/tests/sav/error_prop_loc.res
@@ -1 +1,3 @@
-Property inheritance conflict in class D for `toto': conflicting properties are defined in B, C
+1
+2
+3

diff --git a/tests/sav/error_prop_loc_alt1.res b/tests/sav/error_prop_loc_alt1.res
new file mode 100644 (file)
index 0000000..ca9822e
--- /dev/null
+++ b/tests/sav/error_prop_loc_alt1.res
@@ -0,0 +1,5 @@
+alt/error_prop_loc_alt1.nit:38,1--12: Warning: conflicting property definitions for property toto in D: error_prop_loc_alt1#B#toto error_prop_loc_alt1#C#toto
+1
+2
+3
+3

diff --git a/tests/sav/error_redef_1alt4_alt5.res b/tests/sav/error_redef_1alt4_alt5.res
index 18f8f3d..e69de29 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt5.res
+++ b/tests/sav/error_redef_1alt4_alt5.res
@@ -1 +0,0 @@
-alt/error_redef_1alt4_alt5.nit:30,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt4_alt9.res b/tests/sav/error_redef_1alt4_alt9.res
index da892e9..e69de29 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt9.res
+++ b/tests/sav/error_redef_1alt4_alt9.res
@@ -1 +0,0 @@
-alt/error_redef_1alt4_alt9.nit:34,15: Syntax error: untyped parameter.

diff --git a/tests/sav/fixme/error_prop_loc.res b/tests/sav/fixme/error_prop_loc.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/error_redef_1alt4_alt5.res b/tests/sav/fixme/error_redef_1alt4_alt5.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/error_redef_1alt4_alt9.res b/tests/sav/fixme/error_redef_1alt4_alt9.res
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/sav/fixme/test_inheritance_raf.res b/tests/sav/fixme/test_inheritance_raf.res
deleted file mode 100644 (file)
index dd8e78f..0000000
--- a/tests/sav/fixme/test_inheritance_raf.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-1
-5
-5
-1
-2
-5
-2
-1
-1
-3
-7
-1
-2
-3
-4

diff --git a/tests/sav/nitc/base_for_nullable.res b/tests/sav/nitc/base_for_nullable.res
deleted file mode 100644 (file)
index a75893d..0000000
--- a/tests/sav/nitc/base_for_nullable.res
+++ /dev/null
@@ -1 +0,0 @@
-base_for_nullable.nit:21,10--13: Type error: 'for' on a nullable expression.

diff --git a/tests/sav/nitc/base_for_nullable_alt1.res b/tests/sav/nitc/base_for_nullable_alt1.res
deleted file mode 100644 (file)
index 1baed81..0000000
--- a/tests/sav/nitc/base_for_nullable_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-alt/base_for_nullable_alt1.nit:21,10--13: Type error: 'for' on a nullable expression.

diff --git a/tests/sav/nitc/base_for_nullable_alt2.res b/tests/sav/nitc/base_for_nullable_alt2.res
deleted file mode 100644 (file)
index 14de0ee..0000000
--- a/tests/sav/nitc/base_for_nullable_alt2.res
+++ /dev/null
@@ -1 +0,0 @@
-alt/base_for_nullable_alt2.nit:21,10--13: Type error: 'for' on a nullable expression.

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt2.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt4.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-common/fixme/base_attr_init_val_raf_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_raf_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_raf_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt2.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt2.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt4.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt4.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt5.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt5.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-common/fixme/base_covar_int2_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int2_alt3.res
rename to tests/sav/nitg-common/fixme/base_covar_int2_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-common/fixme/base_covar_int2_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int2_alt5.res
rename to tests/sav/nitg-common/fixme/base_covar_int2_alt5.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt3.res b/tests/sav/nitg-common/fixme/base_covar_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_covar_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_for_finish.res b/tests/sav/nitg-common/fixme/base_for_finish.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_for_finish.res
rename to tests/sav/nitg-common/fixme/base_for_finish.res

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-g/fixme/base_covar_int_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-g/fixme/base_for_finish.res b/tests/sav/nitg-g/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-g/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt3.res b/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-s/fixme/base_for_finish.res b/tests/sav/nitg-s/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-s/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res b/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-sg/fixme/base_for_finish.res b/tests/sav/nitg-sg/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-sg/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/sav/nitg-sg/fixme/test_platform_android.res b/tests/sav/nitg-sg/fixme/test_platform_android.res
new file mode 100644 (file)
index 0000000..4ad3dc3
--- /dev/null
+++ b/tests/sav/nitg-sg/fixme/test_platform_android.res
@@ -0,0 +1 @@
+UNDEFINED

diff --git a/tests/sav/test_inheritance_raf.res b/tests/sav/test_inheritance_raf.res
index a007f82..dd8e78f 100644 (file)
--- a/tests/sav/test_inheritance_raf.res
+++ b/tests/sav/test_inheritance_raf.res
@@ -1 +1,16 @@
-Property inheritance conflict in class B for `i': conflicting properties are defined in B, A
+1
+1
+5
+5
+1
+2
+5
+2
+1
+1
+3
+7
+1
+2
+3
+4

diff --git a/tests/tests.sh b/tests/tests.sh
index 76ecf2c..09eb300 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -373,22 +373,27 @@ case $engine in
                engine=nitg-s;
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-s)
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-e)
                enginebinname=nitg;
                OPT="--erasure $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-sg)
                enginebinname=nitg;
                OPT="--semi-global $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-g)
                enginebinname=nitg;
                OPT="--global $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nit)
                engine=niti