From 35a16e863488bdeb509fa132dee6535599c43c0f Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Sun, 2 Dec 2012 22:52:11 -0500 Subject: [PATCH] tests: put stderr before stdout The result files contain in order: - compiler messages - error output - standard output This improve the compatibility of res with niti since compiler messages are issued on the error output. Update the sav/* file to reflect the change. Signed-off-by: Jean Privat --- tests/sav/base_abstract_fun_alt1.sav | 2 +- tests/sav/base_as_cast_alt1.sav | 2 +- tests/sav/base_as_cast_alt2.sav | 2 +- tests/sav/base_as_cast_alt3.sav | 2 +- tests/sav/base_as_cast_alt4.sav | 2 +- tests/sav/base_as_cast_alt5.sav | 2 +- tests/sav/base_as_cast_alt6.sav | 2 +- tests/sav/base_as_notnull_alt5.res | 2 +- tests/sav/base_as_notnull_alt5.sav | 2 +- tests/sav/base_as_notnull_alt6.res | 2 +- tests/sav/base_as_notnull_alt6.sav | 2 +- tests/sav/base_assert2_alt3.sav | 2 +- tests/sav/base_assert2_alt4.sav | 2 +- tests/sav/base_assert_alt4.sav | 2 +- tests/sav/{nitg => }/base_attr_gen_alt1.res | 0 tests/sav/base_attr_isset_alt3.res | 2 +- tests/sav/base_attr_isset_alt3.sav | 2 +- tests/sav/base_attr_isset_alt4.res | 2 +- tests/sav/base_attr_isset_alt4.sav | 2 +- tests/sav/base_attr_nullable_alt2.res | 2 +- tests/sav/base_attr_nullable_alt2.sav | 2 +- tests/sav/base_attr_nullable_alt4.sav | 2 +- tests/sav/base_attr_nullable_alt5.sav | 2 +- tests/sav/base_attr_nullable_int_alt2.res | 2 +- tests/sav/base_attr_nullable_int_alt2.sav | 2 +- tests/sav/base_attr_nullable_int_alt4.sav | 2 +- tests/sav/base_attr_nullable_int_alt5.sav | 2 +- tests/sav/{nitg => }/base_classid.res | 0 tests/sav/base_closure_break_default2_alt3.sav | 2 +- tests/sav/base_closure_break_default_alt3.sav | 2 +- tests/sav/base_closure_default1_alt3.sav | 2 +- tests/sav/base_closure_default2_alt3.sav | 2 +- tests/sav/base_closure_default3_alt3.sav | 2 +- tests/sav/base_closure_default4_alt3.sav | 2 +- tests/sav/base_conflict_class_name_alt1.sav | 2 +- tests/sav/base_conflict_class_name_alt2.sav | 2 +- tests/sav/base_conflict_submodule_name_alt1.sav | 2 +- tests/sav/base_conflict_submodule_name_alt2.sav | 2 +- tests/sav/{nitg => }/base_isa_nil.res | 0 tests/sav/base_primitive_null_alt1.sav | 2 +- tests/sav/base_primitive_null_alt2.sav | 2 +- tests/sav/base_primitive_null_alt3.sav | 2 +- tests/sav/base_virtual_int_alt2.res | 2 +- tests/sav/base_virtual_int_alt2.sav | 2 +- tests/sav/base_virtual_type_check_alt10.res | 2 +- tests/sav/base_virtual_type_check_alt10.sav | 2 +- tests/sav/base_virtual_type_check_alt8.res | 2 +- tests/sav/base_virtual_type_check_alt8.sav | 2 +- tests/sav/nitdoc.res | 2 +- tests/sav/nitdoc_args1.res | 2 +- tests/sav/niti/base_classid.res | 11 ----------- tests/sav/niti/base_isa_nil.res | 15 --------------- tests/sav/niti/base_virtual_int_alt3.res | 4 ---- tests/sav/niti/fixme/base_virtual_int_alt2.res | 2 +- tests/sav/{nitg => niti}/test_attr_easy.res | 2 +- tests/sav/nits.res | 2 +- tests/sav/rterror_null_receiver_alt1.sav | 2 +- tests/sav/rterror_null_receiver_alt2.sav | 2 +- tests/sav/rterror_null_receiver_alt3.sav | 2 +- tests/sav/rterror_null_receiver_alt4.res | 2 +- tests/sav/rterror_null_receiver_alt4.sav | 2 +- tests/sav/rterror_null_receiver_alt5.sav | 2 +- tests/sav/rterror_null_receiver_alt6.res | 2 +- tests/sav/rterror_null_receiver_alt6.sav | 2 +- tests/sav/test_attr_easy.res | 8 ++++---- tests/sav/test_fdstream.sav | 2 +- tests/sav/test_map_closure_default_alt1.sav | 2 +- tests/sav/test_variance_param_alt1.res | 2 +- tests/sav/test_variance_param_alt1.sav | 2 +- tests/sav/test_variance_param_alt2.res | 2 +- tests/sav/test_variance_param_alt2.sav | 2 +- tests/sav/test_variance_param_alt3.res | 2 +- tests/sav/test_variance_param_alt3.sav | 2 +- tests/sav/test_variance_param_alt4.res | 2 +- tests/sav/test_variance_param_alt4.sav | 2 +- tests/sav/test_variance_param_alt5.res | 2 +- tests/sav/test_variance_param_alt5.sav | 2 +- tests/sav/test_variance_param_alt6.res | 2 +- tests/sav/test_variance_param_alt6.sav | 2 +- tests/tests.sh | 11 +++++------ 80 files changed, 81 insertions(+), 112 deletions(-) rename tests/sav/{nitg => }/base_attr_gen_alt1.res (100%) rename tests/sav/{nitg => }/base_classid.res (100%) rename tests/sav/{nitg => }/base_isa_nil.res (100%) delete mode 100644 tests/sav/niti/base_classid.res delete mode 100644 tests/sav/niti/base_isa_nil.res delete mode 100644 tests/sav/niti/base_virtual_int_alt3.res rename tests/sav/{nitg => niti}/test_attr_easy.res (93%) diff --git a/tests/sav/base_abstract_fun_alt1.sav b/tests/sav/base_abstract_fun_alt1.sav index 2324a8d..ec6936c 100644 --- a/tests/sav/base_abstract_fun_alt1.sav +++ b/tests/sav/base_abstract_fun_alt1.sav @@ -1,2 +1,2 @@ -1 Runtime error: Deferred method called (alt/base_abstract_fun_alt1.nit:18) +1 diff --git a/tests/sav/base_as_cast_alt1.sav b/tests/sav/base_as_cast_alt1.sav index 2b07575..b8bd435 100644 --- a/tests/sav/base_as_cast_alt1.sav +++ b/tests/sav/base_as_cast_alt1.sav @@ -1,6 +1,6 @@ alt/base_as_cast_alt1.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt1.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt1.nit:45) 0 0 0 -Runtime error: Cast failed (alt/base_as_cast_alt1.nit:45) diff --git a/tests/sav/base_as_cast_alt2.sav b/tests/sav/base_as_cast_alt2.sav index 0184469..4222067 100644 --- a/tests/sav/base_as_cast_alt2.sav +++ b/tests/sav/base_as_cast_alt2.sav @@ -1,6 +1,6 @@ alt/base_as_cast_alt2.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt2.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt2.nit:46) 0 0 0 -Runtime error: Cast failed (alt/base_as_cast_alt2.nit:46) diff --git a/tests/sav/base_as_cast_alt3.sav b/tests/sav/base_as_cast_alt3.sav index af1fdd0..4dcc2ef 100644 --- a/tests/sav/base_as_cast_alt3.sav +++ b/tests/sav/base_as_cast_alt3.sav @@ -1,6 +1,6 @@ alt/base_as_cast_alt3.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt3.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt3.nit:47) 0 0 0 -Runtime error: Cast failed (alt/base_as_cast_alt3.nit:47) diff --git a/tests/sav/base_as_cast_alt4.sav b/tests/sav/base_as_cast_alt4.sav index ed7c0db..685be2d 100644 --- a/tests/sav/base_as_cast_alt4.sav +++ b/tests/sav/base_as_cast_alt4.sav @@ -1,6 +1,6 @@ alt/base_as_cast_alt4.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt4.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt4.nit:48) 0 0 0 -Runtime error: Cast failed (alt/base_as_cast_alt4.nit:48) diff --git a/tests/sav/base_as_cast_alt5.sav b/tests/sav/base_as_cast_alt5.sav index daf3c03..802a10c 100644 --- a/tests/sav/base_as_cast_alt5.sav +++ b/tests/sav/base_as_cast_alt5.sav @@ -1,5 +1,6 @@ alt/base_as_cast_alt5.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt5.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt5.nit:57) 0 0 0 @@ -9,4 +10,3 @@ alt/base_as_cast_alt5.nit:52,1--12: Warning: Expression is already a Object. 2 2 2 -Runtime error: Cast failed (alt/base_as_cast_alt5.nit:57) diff --git a/tests/sav/base_as_cast_alt6.sav b/tests/sav/base_as_cast_alt6.sav index c8b3d4c..597f534 100644 --- a/tests/sav/base_as_cast_alt6.sav +++ b/tests/sav/base_as_cast_alt6.sav @@ -1,5 +1,6 @@ alt/base_as_cast_alt6.nit:42,1--12: Warning: Expression is already a Object. alt/base_as_cast_alt6.nit:52,1--12: Warning: Expression is already a Object. +Runtime error: Cast failed (alt/base_as_cast_alt6.nit:58) 0 0 0 @@ -9,4 +10,3 @@ alt/base_as_cast_alt6.nit:52,1--12: Warning: Expression is already a Object. 2 2 2 -Runtime error: Cast failed (alt/base_as_cast_alt6.nit:58) diff --git a/tests/sav/base_as_notnull_alt5.res b/tests/sav/base_as_notnull_alt5.res index fe284bf..917dafb 100644 --- a/tests/sav/base_as_notnull_alt5.res +++ b/tests/sav/base_as_notnull_alt5.res @@ -1,3 +1,4 @@ +Runtime error: Cast failed (alt/base_as_notnull_alt5.nit:59) 1 2 3 @@ -8,4 +9,3 @@ 3 6 -Runtime error: Cast failed (alt/base_as_notnull_alt5.nit:59) diff --git a/tests/sav/base_as_notnull_alt5.sav b/tests/sav/base_as_notnull_alt5.sav index bfb13b9..8fd3cb1 100644 --- a/tests/sav/base_as_notnull_alt5.sav +++ b/tests/sav/base_as_notnull_alt5.sav @@ -2,6 +2,7 @@ alt/base_as_notnull_alt5.nit:41,6: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt5.nit:42,6--7: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt5.nit:43,6: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt5.nit:52,6: Warning: 'as(not null)' on non nullable type. +Runtime error: Cast failed (alt/base_as_notnull_alt5.nit:59) 1 2 3 @@ -12,4 +13,3 @@ alt/base_as_notnull_alt5.nit:52,6: Warning: 'as(not null)' on non nullable type. 3 6 -Runtime error: Cast failed (alt/base_as_notnull_alt5.nit:59) diff --git a/tests/sav/base_as_notnull_alt6.res b/tests/sav/base_as_notnull_alt6.res index 4e6538e..49784b7 100644 --- a/tests/sav/base_as_notnull_alt6.res +++ b/tests/sav/base_as_notnull_alt6.res @@ -1,3 +1,4 @@ +Runtime error: Cast failed (alt/base_as_notnull_alt6.nit:60) 1 2 3 @@ -8,4 +9,3 @@ 3 6 -Runtime error: Cast failed (alt/base_as_notnull_alt6.nit:60) diff --git a/tests/sav/base_as_notnull_alt6.sav b/tests/sav/base_as_notnull_alt6.sav index 1f7d769..219d174 100644 --- a/tests/sav/base_as_notnull_alt6.sav +++ b/tests/sav/base_as_notnull_alt6.sav @@ -2,6 +2,7 @@ alt/base_as_notnull_alt6.nit:41,6: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt6.nit:42,6--7: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt6.nit:43,6: Warning: 'as(not null)' on non nullable type. alt/base_as_notnull_alt6.nit:52,6: Warning: 'as(not null)' on non nullable type. +Runtime error: Cast failed (alt/base_as_notnull_alt6.nit:60) 1 2 3 @@ -12,4 +13,3 @@ alt/base_as_notnull_alt6.nit:52,6: Warning: 'as(not null)' on non nullable type. 3 6 -Runtime error: Cast failed (alt/base_as_notnull_alt6.nit:60) diff --git a/tests/sav/base_assert2_alt3.sav b/tests/sav/base_assert2_alt3.sav index 2120bda..fc5c4ba 100644 --- a/tests/sav/base_assert2_alt3.sav +++ b/tests/sav/base_assert2_alt3.sav @@ -1,3 +1,3 @@ +Runtime error: Assert failed (alt/base_assert2_alt3.nit:30) false 1 -Runtime error: Assert failed (alt/base_assert2_alt3.nit:30) diff --git a/tests/sav/base_assert2_alt4.sav b/tests/sav/base_assert2_alt4.sav index f546f5c..9f731df 100644 --- a/tests/sav/base_assert2_alt4.sav +++ b/tests/sav/base_assert2_alt4.sav @@ -1,3 +1,4 @@ +Runtime error: Assert failed (alt/base_assert2_alt4.nit:43) true 1 @@ -8,4 +9,3 @@ true false 1 2 -Runtime error: Assert failed (alt/base_assert2_alt4.nit:43) diff --git a/tests/sav/base_assert_alt4.sav b/tests/sav/base_assert_alt4.sav index 3571e60..d16f15d 100644 --- a/tests/sav/base_assert_alt4.sav +++ b/tests/sav/base_assert_alt4.sav @@ -1,2 +1,2 @@ -0 Runtime error: Assert failed (alt/base_assert_alt4.nit:27) +0 diff --git a/tests/sav/nitg/base_attr_gen_alt1.res b/tests/sav/base_attr_gen_alt1.res similarity index 100% rename from tests/sav/nitg/base_attr_gen_alt1.res rename to tests/sav/base_attr_gen_alt1.res diff --git a/tests/sav/base_attr_isset_alt3.res b/tests/sav/base_attr_isset_alt3.res index d80fd6e..a2b8de7 100644 --- a/tests/sav/base_attr_isset_alt3.res +++ b/tests/sav/base_attr_isset_alt3.res @@ -1,3 +1,4 @@ +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit:101) 1 false false @@ -7,4 +8,3 @@ false 3 true false -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit:101) diff --git a/tests/sav/base_attr_isset_alt3.sav b/tests/sav/base_attr_isset_alt3.sav index c8d3ea5..47eff56 100644 --- a/tests/sav/base_attr_isset_alt3.sav +++ b/tests/sav/base_attr_isset_alt3.sav @@ -1,3 +1,4 @@ +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit) 1 false false @@ -7,4 +8,3 @@ false 3 true false -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt3.nit) diff --git a/tests/sav/base_attr_isset_alt4.res b/tests/sav/base_attr_isset_alt4.res index eb0217e..b83eb13 100644 --- a/tests/sav/base_attr_isset_alt4.res +++ b/tests/sav/base_attr_isset_alt4.res @@ -1,3 +1,4 @@ +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit:100) 1 false false @@ -7,4 +8,3 @@ false 3 true false -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit:100) diff --git a/tests/sav/base_attr_isset_alt4.sav b/tests/sav/base_attr_isset_alt4.sav index 2b42de3..7ae8195 100644 --- a/tests/sav/base_attr_isset_alt4.sav +++ b/tests/sav/base_attr_isset_alt4.sav @@ -1,3 +1,4 @@ +Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit) 1 false false @@ -7,4 +8,3 @@ false 3 true false -Runtime error: Uninitialized attribute _a2 (alt/base_attr_isset_alt4.nit) diff --git a/tests/sav/base_attr_nullable_alt2.res b/tests/sav/base_attr_nullable_alt2.res index a78058e..d238261 100644 --- a/tests/sav/base_attr_nullable_alt2.res +++ b/tests/sav/base_attr_nullable_alt2.res @@ -1,2 +1,2 @@ -1 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt2.nit:39) +1 diff --git a/tests/sav/base_attr_nullable_alt2.sav b/tests/sav/base_attr_nullable_alt2.sav index 72db1b2..bd9cbf0 100644 --- a/tests/sav/base_attr_nullable_alt2.sav +++ b/tests/sav/base_attr_nullable_alt2.sav @@ -1,2 +1,2 @@ -1 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt2.nit:35) +1 diff --git a/tests/sav/base_attr_nullable_alt4.sav b/tests/sav/base_attr_nullable_alt4.sav index d6f80e3..1a98ce8 100644 --- a/tests/sav/base_attr_nullable_alt4.sav +++ b/tests/sav/base_attr_nullable_alt4.sav @@ -1,2 +1,2 @@ -10 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_alt4.nit:45) +10 diff --git a/tests/sav/base_attr_nullable_alt5.sav b/tests/sav/base_attr_nullable_alt5.sav index 575932a..891e424 100644 --- a/tests/sav/base_attr_nullable_alt5.sav +++ b/tests/sav/base_attr_nullable_alt5.sav @@ -1,3 +1,3 @@ +Runtime error: Uninitialized attribute _a3 (alt/base_attr_nullable_alt5.nit:66) 10 20 -Runtime error: Uninitialized attribute _a3 (alt/base_attr_nullable_alt5.nit:66) diff --git a/tests/sav/base_attr_nullable_int_alt2.res b/tests/sav/base_attr_nullable_int_alt2.res index b3ac302..db000f8 100644 --- a/tests/sav/base_attr_nullable_int_alt2.res +++ b/tests/sav/base_attr_nullable_int_alt2.res @@ -1,2 +1,2 @@ -1 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_int_alt2.nit:33) +1 diff --git a/tests/sav/base_attr_nullable_int_alt2.sav b/tests/sav/base_attr_nullable_int_alt2.sav index b9e4c9b..52f9df3 100644 --- a/tests/sav/base_attr_nullable_int_alt2.sav +++ b/tests/sav/base_attr_nullable_int_alt2.sav @@ -1,2 +1,2 @@ -1 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_int_alt2.nit:29) +1 diff --git a/tests/sav/base_attr_nullable_int_alt4.sav b/tests/sav/base_attr_nullable_int_alt4.sav index f110a03..887e9ab 100644 --- a/tests/sav/base_attr_nullable_int_alt4.sav +++ b/tests/sav/base_attr_nullable_int_alt4.sav @@ -1,2 +1,2 @@ -10 Runtime error: Uninitialized attribute _a2 (alt/base_attr_nullable_int_alt4.nit:39) +10 diff --git a/tests/sav/base_attr_nullable_int_alt5.sav b/tests/sav/base_attr_nullable_int_alt5.sav index e03cda0..5d4cf8c 100644 --- a/tests/sav/base_attr_nullable_int_alt5.sav +++ b/tests/sav/base_attr_nullable_int_alt5.sav @@ -1,3 +1,3 @@ +Runtime error: Uninitialized attribute _a3 (alt/base_attr_nullable_int_alt5.nit:60) 10 20 -Runtime error: Uninitialized attribute _a3 (alt/base_attr_nullable_int_alt5.nit:60) diff --git a/tests/sav/nitg/base_classid.res b/tests/sav/base_classid.res similarity index 100% rename from tests/sav/nitg/base_classid.res rename to tests/sav/base_classid.res diff --git a/tests/sav/base_closure_break_default2_alt3.sav b/tests/sav/base_closure_break_default2_alt3.sav index a023f0c..1e2ec64 100644 --- a/tests/sav/base_closure_break_default2_alt3.sav +++ b/tests/sav/base_closure_break_default2_alt3.sav @@ -1,6 +1,6 @@ +Runtime error: Aborted (alt/base_closure_break_default2_alt3.nit:25) 0 1 2 0 1 -Runtime error: Aborted (alt/base_closure_break_default2_alt3.nit:25) diff --git a/tests/sav/base_closure_break_default_alt3.sav b/tests/sav/base_closure_break_default_alt3.sav index cb84d2b..607c891 100644 --- a/tests/sav/base_closure_break_default_alt3.sav +++ b/tests/sav/base_closure_break_default_alt3.sav @@ -1,6 +1,6 @@ +Runtime error: Aborted (alt/base_closure_break_default_alt3.nit:25) 0 1 2 0 1 -Runtime error: Aborted (alt/base_closure_break_default_alt3.nit:25) diff --git a/tests/sav/base_closure_default1_alt3.sav b/tests/sav/base_closure_default1_alt3.sav index f6ba938..81fd6be 100644 --- a/tests/sav/base_closure_default1_alt3.sav +++ b/tests/sav/base_closure_default1_alt3.sav @@ -1,7 +1,7 @@ +Runtime error: Aborted (alt/base_closure_default1_alt3.nit:25) 0 1 2 3 0 1 -Runtime error: Aborted (alt/base_closure_default1_alt3.nit:25) diff --git a/tests/sav/base_closure_default2_alt3.sav b/tests/sav/base_closure_default2_alt3.sav index 226f40f..e280916 100644 --- a/tests/sav/base_closure_default2_alt3.sav +++ b/tests/sav/base_closure_default2_alt3.sav @@ -1,7 +1,7 @@ +Runtime error: Aborted (alt/base_closure_default2_alt3.nit:25) 0 1 2 3 0 1 -Runtime error: Aborted (alt/base_closure_default2_alt3.nit:25) diff --git a/tests/sav/base_closure_default3_alt3.sav b/tests/sav/base_closure_default3_alt3.sav index 34838b6..051a30e 100644 --- a/tests/sav/base_closure_default3_alt3.sav +++ b/tests/sav/base_closure_default3_alt3.sav @@ -1,7 +1,7 @@ +Runtime error: Aborted (alt/base_closure_default3_alt3.nit:25) 0 1 2 3 0 1 -Runtime error: Aborted (alt/base_closure_default3_alt3.nit:25) diff --git a/tests/sav/base_closure_default4_alt3.sav b/tests/sav/base_closure_default4_alt3.sav index 6c5fac2..7d9fdbc 100644 --- a/tests/sav/base_closure_default4_alt3.sav +++ b/tests/sav/base_closure_default4_alt3.sav @@ -1,7 +1,7 @@ +Runtime error: Aborted (alt/base_closure_default4_alt3.nit:25) 0 1 2 3 0 1 -Runtime error: Aborted (alt/base_closure_default4_alt3.nit:25) diff --git a/tests/sav/base_conflict_class_name_alt1.sav b/tests/sav/base_conflict_class_name_alt1.sav index 6d32c6d..461bf28 100644 --- a/tests/sav/base_conflict_class_name_alt1.sav +++ b/tests/sav/base_conflict_class_name_alt1.sav @@ -1,3 +1,3 @@ +Runtime error: Cast failed (base_conflict_class_name_submodule1.nit:22) 1 2 -Runtime error: Cast failed (base_conflict_class_name_submodule1.nit:22) diff --git a/tests/sav/base_conflict_class_name_alt2.sav b/tests/sav/base_conflict_class_name_alt2.sav index 880a2be..a158579 100644 --- a/tests/sav/base_conflict_class_name_alt2.sav +++ b/tests/sav/base_conflict_class_name_alt2.sav @@ -1,3 +1,3 @@ +Runtime error: Cast failed (base_conflict_class_name_submodule2.nit:22) 1 2 -Runtime error: Cast failed (base_conflict_class_name_submodule2.nit:22) diff --git a/tests/sav/base_conflict_submodule_name_alt1.sav b/tests/sav/base_conflict_submodule_name_alt1.sav index 06e5d4a..720c5a6 100644 --- a/tests/sav/base_conflict_submodule_name_alt1.sav +++ b/tests/sav/base_conflict_submodule_name_alt1.sav @@ -1,3 +1,3 @@ +Runtime error: Cast failed (base_conflict_submodule_name_submodule1/submodule.nit:22) 1 2 -Runtime error: Cast failed (base_conflict_submodule_name_submodule1/submodule.nit:22) diff --git a/tests/sav/base_conflict_submodule_name_alt2.sav b/tests/sav/base_conflict_submodule_name_alt2.sav index 8c77cbc..56cdd15 100644 --- a/tests/sav/base_conflict_submodule_name_alt2.sav +++ b/tests/sav/base_conflict_submodule_name_alt2.sav @@ -1,3 +1,3 @@ +Runtime error: Cast failed (base_conflict_submodule_name_submodule2/submodule.nit:22) 1 2 -Runtime error: Cast failed (base_conflict_submodule_name_submodule2/submodule.nit:22) diff --git a/tests/sav/nitg/base_isa_nil.res b/tests/sav/base_isa_nil.res similarity index 100% rename from tests/sav/nitg/base_isa_nil.res rename to tests/sav/base_isa_nil.res diff --git a/tests/sav/base_primitive_null_alt1.sav b/tests/sav/base_primitive_null_alt1.sav index 1c1c82e..873d14f 100644 --- a/tests/sav/base_primitive_null_alt1.sav +++ b/tests/sav/base_primitive_null_alt1.sav @@ -1,6 +1,6 @@ +Runtime error: Reciever is null (alt/base_primitive_null_alt1.nit:34) I true true true true -Runtime error: Reciever is null (alt/base_primitive_null_alt1.nit:34) diff --git a/tests/sav/base_primitive_null_alt2.sav b/tests/sav/base_primitive_null_alt2.sav index 9003e83..bef3335 100644 --- a/tests/sav/base_primitive_null_alt2.sav +++ b/tests/sav/base_primitive_null_alt2.sav @@ -1,3 +1,4 @@ +Runtime error: Reciever is null (alt/base_primitive_null_alt2.nit:43) I true true @@ -8,4 +9,3 @@ true true true true -Runtime error: Reciever is null (alt/base_primitive_null_alt2.nit:43) diff --git a/tests/sav/base_primitive_null_alt3.sav b/tests/sav/base_primitive_null_alt3.sav index 6ef765e..ba81322 100644 --- a/tests/sav/base_primitive_null_alt3.sav +++ b/tests/sav/base_primitive_null_alt3.sav @@ -1,3 +1,4 @@ +Runtime error: Reciever is null (alt/base_primitive_null_alt3.nit:52) I true true @@ -13,4 +14,3 @@ true true true true -Runtime error: Reciever is null (alt/base_primitive_null_alt3.nit:52) diff --git a/tests/sav/base_virtual_int_alt2.res b/tests/sav/base_virtual_int_alt2.res index 7a4bd7e..0fe5bdc 100644 --- a/tests/sav/base_virtual_int_alt2.res +++ b/tests/sav/base_virtual_int_alt2.res @@ -1,3 +1,3 @@ +Runtime error: Cast failed (../lib/standard/kernel.nit:234) true true -Runtime error: Cast failed (../lib/standard/kernel.nit:234) diff --git a/tests/sav/base_virtual_int_alt2.sav b/tests/sav/base_virtual_int_alt2.sav index 3d23470..a9013d7 100644 --- a/tests/sav/base_virtual_int_alt2.sav +++ b/tests/sav/base_virtual_int_alt2.sav @@ -1,3 +1,3 @@ +Runtime error: Cast failed (../lib/standard/kernel.nit) true true -Runtime error: Cast failed (../lib/standard/kernel.nit) diff --git a/tests/sav/base_virtual_type_check_alt10.res b/tests/sav/base_virtual_type_check_alt10.res index 2367533..727b8b4 100644 --- a/tests/sav/base_virtual_type_check_alt10.res +++ b/tests/sav/base_virtual_type_check_alt10.res @@ -1,3 +1,4 @@ +Runtime error: Cast failed (alt/base_virtual_type_check_alt10.nit:37) J "$ff.res" process_result $bf $bf elif [ -x "./$ff.bin" ]; then - cp "$ff.cmp.err" "$ff.res" test -z "$tap" && echo -n ". " # Execute args="" @@ -335,7 +334,7 @@ END echo "" echo "NIT_NO_STACK=1 ./$ff.bin" $args fi - NIT_NO_STACK=1 "./$ff.bin" $args < "$inputs" >> "$ff.res" 2>"$ff.err" + NIT_NO_STACK=1 "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err" if [ "x$verbose" = "xtrue" ]; then cat "$ff.res" cat >&2 "$ff.err" @@ -345,9 +344,8 @@ END elif [ -d "$ff.write" ]; then LANG=C /bin/ls -F $ff.write >> "$ff.res" fi - if [ -s "$ff.err" ]; then - cat "$ff.err" >> "$ff.res" - fi + cp "$ff.res" "$ff.res2" + cat "$ff.cmp.err" "$ff.err" "$ff.res2" > "$ff.res" process_result $bf $bf if [ -f "$f.args" ]; then @@ -379,7 +377,8 @@ END LANG=C /bin/ls -F $fff.write >> "$fff.res" fi if [ -s "$fff.err" ]; then - cat "$fff.err" >> "$fff.res" + cp "$fff.res" "$fff.res2" + cat "$fff.err" "$fff.res2" > "$fff.res" fi process_result $bff " args #$cptr" done < $fargs -- 1.7.9.5