diff --git a/Makefile b/Makefile
index 3cd3dbb..ddcc570 100644
--- a/Makefile
+++ b/Makefile
@@ -312,8 +312,9 @@ tcc-doc.info: tcc-doc.texi
 # in tests subdir
 export LIBTCC1
 
-%est:
+%est: all
 	$(MAKE) -C tests $@
+	prove -v
 
 clean:
 	rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF)
diff --git a/t/00_assignment.t b/t/00_assignment.t
index af99394..0340e88 100644
--- a/t/00_assignment.t
+++ b/t/00_assignment.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/01_comment.t b/t/01_comment.t
index 06dfd56..51a3c7a 100644
--- a/t/01_comment.t
+++ b/t/01_comment.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/02_printf.t b/t/02_printf.t
index 75b3ad3..94fa2a1 100644
--- a/t/02_printf.t
+++ b/t/02_printf.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
@@ -49,3 +49,4 @@ String 'hello', 'there' is 'hello', 'there'
 Character 'A' is 'A'
 Character 'a' is 'a'
 --- err
+
diff --git a/t/03_struct.t b/t/03_struct.t
index 5095a73..8e686d8 100644
--- a/t/03_struct.t
+++ b/t/03_struct.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/04_for.t b/t/04_for.t
index 375358d..2246609 100644
--- a/t/04_for.t
+++ b/t/04_for.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/05_array.t b/t/05_array.t
index a330b3d..851258d 100644
--- a/t/05_array.t
+++ b/t/05_array.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/06_case.t b/t/06_case.t
index 584930f..33299b2 100644
--- a/t/06_case.t
+++ b/t/06_case.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/07_function.t b/t/07_function.t
index 1638dad..c8cb908 100644
--- a/t/07_function.t
+++ b/t/07_function.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/08_while.t b/t/08_while.t
index de0402a..26ad9db 100644
--- a/t/08_while.t
+++ b/t/08_while.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/09_do_while.t b/t/09_do_while.t
index 3c3d950..acc7cfd 100644
--- a/t/09_do_while.t
+++ b/t/09_do_while.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/10_pointer.t b/t/10_pointer.t
index 89e46eb..dd73baa 100644
--- a/t/10_pointer.t
+++ b/t/10_pointer.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/11_precedence.t b/t/11_precedence.t
index 091d88f..a9f409b 100644
--- a/t/11_precedence.t
+++ b/t/11_precedence.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/12_hashdefine.t b/t/12_hashdefine.t
index 779f253..c325194 100644
--- a/t/12_hashdefine.t
+++ b/t/12_hashdefine.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/13_integer_literals.t b/t/13_integer_literals.t
index 848987b..13c22a6 100644
--- a/t/13_integer_literals.t
+++ b/t/13_integer_literals.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/14_if.t b/t/14_if.t
index a318277..00b9186 100644
--- a/t/14_if.t
+++ b/t/14_if.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/15_recursion.t b/t/15_recursion.t
index 4d11229..6c8e73e 100644
--- a/t/15_recursion.t
+++ b/t/15_recursion.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/16_nesting.t b/t/16_nesting.t
index 8865b5f..55042b2 100644
--- a/t/16_nesting.t
+++ b/t/16_nesting.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/17_enum.t b/t/17_enum.t
index 3823969..688642d 100644
--- a/t/17_enum.t
+++ b/t/17_enum.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/18_include.t b/t/18_include.t
index 0ff1815..5cf56f7 100644
--- a/t/18_include.t
+++ b/t/18_include.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/19_pointer_arithmetic.t b/t/19_pointer_arithmetic.t
index 5aed607..ef18177 100644
--- a/t/19_pointer_arithmetic.t
+++ b/t/19_pointer_arithmetic.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/20_pointer_comparison.t b/t/20_pointer_comparison.t
index ec5ce30..f30b27e 100644
--- a/t/20_pointer_comparison.t
+++ b/t/20_pointer_comparison.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/21_char_array.t b/t/21_char_array.t
index 4d23fad..19efba7 100644
--- a/t/21_char_array.t
+++ b/t/21_char_array.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/22_floating_point.t b/t/22_floating_point.t
index 529847f..4c7d32f 100644
--- a/t/22_floating_point.t
+++ b/t/22_floating_point.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/23_type_coercion.t b/t/23_type_coercion.t
index 1fb4c34..e84ccad 100644
--- a/t/23_type_coercion.t
+++ b/t/23_type_coercion.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/24_math_library.t b/t/24_math_library.t
index 68765ec..db334ad 100644
--- a/t/24_math_library.t
+++ b/t/24_math_library.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/25_quicksort.t b/t/25_quicksort.t
index 4190f2a..d0ea300 100644
--- a/t/25_quicksort.t
+++ b/t/25_quicksort.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/26_character_constants.t b/t/26_character_constants.t
index 3965408..4e9883a 100644
--- a/t/26_character_constants.t
+++ b/t/26_character_constants.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/27_sizeof.t b/t/27_sizeof.t
index f1b2c37..658d82c 100644
--- a/t/27_sizeof.t
+++ b/t/27_sizeof.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/28_strings.t b/t/28_strings.t
index 0308742..399a24a 100644
--- a/t/28_strings.t
+++ b/t/28_strings.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/29_array_address.t b/t/29_array_address.t
index 904f4a7..f8bef0e 100644
--- a/t/29_array_address.t
+++ b/t/29_array_address.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/30_hanoi.t b/t/30_hanoi.t
index 03846af..dd88528 100644
--- a/t/30_hanoi.t
+++ b/t/30_hanoi.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/31_args.t b/t/31_args.t
index 331bb31..fd9a964 100644
--- a/t/31_args.t
+++ b/t/31_args.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/32_led.t b/t/32_led.t
index 5bb74d1..73d9318 100644
--- a/t/32_led.t
+++ b/t/32_led.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/33_ternary_op.t b/t/33_ternary_op.t
index 04ea675..dcdfd60 100644
--- a/t/33_ternary_op.t
+++ b/t/33_ternary_op.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/34_array_assignment.t b/t/34_array_assignment.t
index 6611143..61c55be 100644
--- a/t/34_array_assignment.t
+++ b/t/34_array_assignment.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/35_sizeof.t b/t/35_sizeof.t
index 83ba5fe..1151d0d 100644
--- a/t/35_sizeof.t
+++ b/t/35_sizeof.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/36_array_initialisers.t b/t/36_array_initialisers.t
index b31dbba..70b080b 100644
--- a/t/36_array_initialisers.t
+++ b/t/36_array_initialisers.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/37_sprintf.t b/t/37_sprintf.t
index 14def63..e7905fe 100644
--- a/t/37_sprintf.t
+++ b/t/37_sprintf.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/38_multiple_array_index.t b/t/38_multiple_array_index.t
index 7ce960f..8c3ed47 100644
--- a/t/38_multiple_array_index.t
+++ b/t/38_multiple_array_index.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
@@ -48,6 +48,6 @@ int main()
 x=0: 1 2 3 4
 x=1: 5 6 7 8
 x=2: 9 10 11 12
-x=3: 13 14 15 16 
+x=3: 13 14 15 16
 --- err
 
diff --git a/t/39_typedef.t b/t/39_typedef.t
index a216d40..0f80159 100644
--- a/t/39_typedef.t
+++ b/t/39_typedef.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/40_stdio.t b/t/40_stdio.t
index 3b982d7..3f60b92 100644
--- a/t/40_stdio.t
+++ b/t/40_stdio.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/41_hashif.t b/t/41_hashif.t
index 48e4135..8744f14 100644
--- a/t/41_hashif.t
+++ b/t/41_hashif.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/42_function_pointer.t b/t/42_function_pointer.t
index fd23ddb..6ab5383 100644
--- a/t/42_function_pointer.t
+++ b/t/42_function_pointer.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/43_void_param.t b/t/43_void_param.t
index 846b445..cbbbfbd 100644
--- a/t/43_void_param.t
+++ b/t/43_void_param.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/44_scoped_declarations.t b/t/44_scoped_declarations.t
index f676fbc..44c5e1a 100644
--- a/t/44_scoped_declarations.t
+++ b/t/44_scoped_declarations.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/45_empty_for.t b/t/45_empty_for.t
index 545a2d9..bfa24f2 100644
--- a/t/45_empty_for.t
+++ b/t/45_empty_for.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/46_grep.t b/t/46_grep.t
index bb2beb8..d972be0 100644
--- a/t/46_grep.t
+++ b/t/46_grep.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/47_switch_return.t b/t/47_switch_return.t
index 4aeca2b..135d6e5 100644
--- a/t/47_switch_return.t
+++ b/t/47_switch_return.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/48_nested_break.t b/t/48_nested_break.t
index 52275c0..1e3fd1e 100644
--- a/t/48_nested_break.t
+++ b/t/48_nested_break.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/49_bracket_evaluation.t b/t/49_bracket_evaluation.t
index 55815f9..7be9ad0 100644
--- a/t/49_bracket_evaluation.t
+++ b/t/49_bracket_evaluation.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/50_logical_second_arg.t b/t/50_logical_second_arg.t
index 7e450de..8f3a414 100644
--- a/t/50_logical_second_arg.t
+++ b/t/50_logical_second_arg.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/51_static.t b/t/51_static.t
index 3b59be4..285fccc 100644
--- a/t/51_static.t
+++ b/t/51_static.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/52_unnamed_enum.t b/t/52_unnamed_enum.t
index 9ef8b93..e4e3645 100644
--- a/t/52_unnamed_enum.t
+++ b/t/52_unnamed_enum.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/54_goto.t b/t/54_goto.t
index 6c641ec..dbed338 100644
--- a/t/54_goto.t
+++ b/t/54_goto.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/55_lshift_type.t b/t/55_lshift_type.t
index 24f6804..465f1a9 100644
--- a/t/55_lshift_type.t
+++ b/t/55_lshift_type.t
@@ -2,7 +2,7 @@
 # vi: ft= et tw=4 sw=4
 
 use lib 't/lib';
-use Test::sakura 'no_plan';
+use Test::Sakura 'no_plan';
 
 run_tests();
 
diff --git a/t/lib/Test/sakura.pm b/t/lib/Test/Sakura.pm
similarity index 94%
rename from t/lib/Test/sakura.pm
rename to t/lib/Test/Sakura.pm
index fbe6083..eaade50 100644
--- a/t/lib/Test/sakura.pm
+++ b/t/lib/Test/Sakura.pm
@@ -1,6 +1,6 @@
 # Copyright (C) Guiquan Zhang (guiquanz)
 
-package Test::sakura;
+package Test::Sakura;
 
 use Test::Base -Base;
 use POSIX ();
@@ -51,7 +51,7 @@ sub run_test ($) {
     my $opts = $block->opts;
     my $args = $block->args;
 
-    my $cmd = "./tcc -B./ -I/usr/local/include -D_ANSI_SOURCE -run";
+    my $cmd = "./tcc -B./ -I/usr/local/include -I./t -D_ANSI_SOURCE -run";
 
     if (defined $opts) {
         $cmd .= " $opts";
@@ -84,7 +84,7 @@ sub run_test ($) {
     };
 
     if ($@) {
-        # timed out 
+
         if ($@ =~ /timeout/) {
 
             if (!defined $block->expect_timeout) {
@@ -103,7 +103,6 @@ sub run_test ($) {
     }
 
     if (defined $block->out) {
-        #print($out);
         is $out, $block->out, "$name - stdout eq okay";
     }
 
@@ -116,7 +115,6 @@ sub run_test ($) {
     }
 
     if (defined $block->err) {
-        #print($err);
         is $err, $block->err, "$name - stderr eq okay";
     }
 
diff --git a/t/reindex.pl b/t/reindex.pl
new file mode 100644
index 0000000..1c0adca
--- /dev/null
+++ b/t/reindex.pl
@@ -0,0 +1,63 @@
+#: reindex.pl
+#: reindex .t files for Test::Base based test files
+#: Copyright (c) 2006 Agent Zhang
+#: 2006-04-27 2006-05-09
+
+use strict;
+use warnings;
+
+#use File::Copy;
+use Getopt::Std;
+
+my %opts;
+getopts('hb:', \%opts);
+if ($opts{h} or ! @ARGV) {
+    die "Usage: reindex [-b 0] t/*.t\n";
+}
+
+my $init = $opts{b};
+$init = 1 if not defined $init;
+
+my @files = map glob, @ARGV;
+for my $file (@files) {
+    next if -d $file or $file !~ /\.t_?$/;
+    reindex($file);
+}
+
+sub reindex {
+    my $file = $_[0];
+    open my $in, $file or
+        die "Can't open $file for reading: $!";
+    my @lines;
+    my $counter = $init;
+    my $changed;
+    while (<$in>) {
+        s/\r$//;
+        my $num;
+        s/ ^ === \s+ TEST \s+ (\d+)/$num=$1; "=== TEST " . $counter++/xie;
+        next if !defined $num;
+        if ($num != $counter-1) {
+            $changed++;
+        }
+    } continue {
+        push @lines, $_;
+    }
+    close $in;
+    my $text = join '', @lines;
+    $text =~ s/(?x) \n+ === \s+ TEST/\n\n\n\n=== TEST/ixsg;
+    $text =~ s/__(DATA|END)__\n+=== TEST/__${1}__\n\n=== TEST/;
+    #$text =~ s/\n+$/\n\n/s;
+    if (! $changed and $text eq join '', @lines) {
+        warn "reindex: $file:\tskipped.\n";
+        return;
+    }
+    #File::Copy::copy( $file, "$file.bak" );
+    open my $out, "> $file" or
+        die "Can't open $file for writing: $!";
+    binmode $out;
+    print $out $text;
+    close $out;
+
+    warn "reindex: $file:\tdone.\n";
+}
+
diff --git a/tests/Makefile b/tests/Makefile
index ea98604..0b3fa13 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,8 +11,7 @@ TESTS = \
  hello-exe \
  hello-run \
  libtest \
- test3 \
- moretests
+ test3
 
 # test4 -- problem with -static
 # asmtest -- minor differences with gcc
@@ -73,9 +72,7 @@ libtest: libtcc_test$(EXESUF) $(LIBTCC1)
 libtcc_test$(EXESUF): libtcc_test.c $(top_builddir)/$(LIBTCC)
 	$(CC) -o $@ $^ $(CPPFLAGS) $(CFLAGS) $(NATIVE_DEFINES) $(LIBS) $(LINK_LIBTCC) $(LDFLAGS)
 
-moretests:
-	@echo ------------ $@ ------------
-	$(MAKE) -C tests2
+
 
 # test.ref - generate using gcc
 # copy only tcclib.h so GCC's stddef and stdarg will be used
@@ -193,7 +190,6 @@ cache: tcc_g
 
 # clean
 clean:
-	$(MAKE) -C tests2 $@
 	rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.out?b *.gcc *.exe \
 	   hello libtcc_test tcctest[1234] ex? tcc_g tcclib.h