Fix formatting and also some migration fixes for debugger

21 files changed, 177 insertions, 184 deletions

diff --git a/lib/debugger/test/andor_SUITE.erl b/lib/debugger/test/andor_SUITE.erl
index 6932d5a162..0c0eb78339 100644
--- a/lib/debugger/test/andor_SUITE.erl
+++ b/lib/debugger/test/andor_SUITE.erl
@@ -20,7 +20,9 @@
 %%
 -module(andor_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 t_andalso/1,t_orelse/1,inside/1,overlap/1,
 	 combined/1,in_case/1]).
 
@@ -29,16 +31,16 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
@@ -54,14 +56,14 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
 cases() -> 
-[t_andalso, t_orelse, inside, overlap, combined,
- in_case].
+    [t_andalso, t_orelse, inside, overlap, combined,
+     in_case].
 
 t_andalso(Config) when is_list(Config) ->
     Bs = [true,false],
diff --git a/lib/debugger/test/bs_bincomp_SUITE.erl b/lib/debugger/test/bs_bincomp_SUITE.erl
index c2bd599ae5..e361ebefbb 100644
--- a/lib/debugger/test/bs_bincomp_SUITE.erl
+++ b/lib/debugger/test/bs_bincomp_SUITE.erl
@@ -23,7 +23,9 @@
 
 -module(bs_bincomp_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1]).
 
@@ -42,8 +44,8 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[byte_aligned, bit_aligned, extended_byte_aligned,
- extended_bit_aligned, mixed].
+    [byte_aligned, bit_aligned, extended_byte_aligned,
+     extended_bit_aligned, mixed].
 
 groups() -> 
     [].
@@ -55,10 +57,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index 262ff93500..3ea0b08600 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -19,7 +19,9 @@
 
 -module(bs_construct_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 test1/1, test2/1, test3/1, test4/1, test5/1, testf/1, not_used/1, in_guard/1,
 	 coerce_to_float/1]).
 
@@ -28,21 +30,21 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[test1, test2, test3, test4, test5, testf, not_used,
- in_guard, coerce_to_float].
+    [test1, test2, test3, test4, test5, testf, not_used,
+     in_guard, coerce_to_float].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -57,7 +59,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bs_match_bin_SUITE.erl b/lib/debugger/test/bs_match_bin_SUITE.erl
index 8577a017d8..bbe3728816 100644
--- a/lib/debugger/test/bs_match_bin_SUITE.erl
+++ b/lib/debugger/test/bs_match_bin_SUITE.erl
@@ -21,7 +21,9 @@
 -module(bs_match_bin_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 byte_split_binary/1,bit_split_binary/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -29,20 +31,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[byte_split_binary, bit_split_binary].
+    [byte_split_binary, bit_split_binary].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -57,7 +59,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl
index 11eab8090d..7a5b5c8f74 100644
--- a/lib/debugger/test/bs_match_int_SUITE.erl
+++ b/lib/debugger/test/bs_match_int_SUITE.erl
@@ -20,7 +20,9 @@
 -module(bs_match_int_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -30,20 +32,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    [cases()].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[integer, signed_integer, dynamic, more_dynamic, mml].
+    [integer, signed_integer, dynamic, more_dynamic, mml].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -58,7 +60,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index e0dafa2801..eec0973668 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -20,7 +20,9 @@
 -module(bs_match_misc_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -28,20 +30,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[bound_var, bound_tail, t_float, little_float, sean].
+    [bound_var, bound_tail, t_float, little_float, sean].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -56,7 +58,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bs_match_tail_SUITE.erl b/lib/debugger/test/bs_match_tail_SUITE.erl
index 33f805bbd3..69362b7d14 100644
--- a/lib/debugger/test/bs_match_tail_SUITE.erl
+++ b/lib/debugger/test/bs_match_tail_SUITE.erl
@@ -20,7 +20,9 @@
 -module(bs_match_tail_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 aligned/1,unaligned/1,zero_tail/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -28,20 +30,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[aligned, unaligned, zero_tail].
+    [aligned, unaligned, zero_tail].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -56,7 +58,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bs_utf_SUITE.erl b/lib/debugger/test/bs_utf_SUITE.erl
index adca9356b3..3f85dd855a 100644
--- a/lib/debugger/test/bs_utf_SUITE.erl
+++ b/lib/debugger/test/bs_utf_SUITE.erl
@@ -21,7 +21,8 @@
 
 -module(bs_utf_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1,end_per_suite/1,
 	 init_per_testcase/2,end_per_testcase/2,
 	 utf8_roundtrip/1,unused_utf_char/1,utf16_roundtrip/1,
 	 utf32_roundtrip/1,guard/1,extreme_tripping/1]).
@@ -32,21 +33,21 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[utf8_roundtrip, unused_utf_char, utf16_roundtrip,
- utf32_roundtrip, guard, extreme_tripping].
+    [utf8_roundtrip, unused_utf_char, utf16_roundtrip,
+     utf32_roundtrip, guard, extreme_tripping].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -61,7 +62,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
index c5d8ad550b..e98eeae92e 100644
--- a/lib/debugger/test/bug_SUITE.erl
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -22,16 +22,15 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
-
--export([]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([otp2163/1, otp4845/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, ticket_tests}].
+    [{group, ticket_tests}].
 
 groups() -> 
     [{ticket_tests, [], [otp2163, otp4845]}].
diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl
index 380fb2fe4c..532ded06f6 100644
--- a/lib/debugger/test/dbg_ui_SUITE.erl
+++ b/lib/debugger/test/dbg_ui_SUITE.erl
@@ -25,19 +25,13 @@
 
 
 % Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
--export([function_tests/1]).
-
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 % Test cases must be exported.
 -export ([dbg_ui/1]).
 
-
-
-
-
 % Manual test suites/cases exports
--export([]).
 -export([start1/1, interpret1/1, quit1/1,
 	 start2/1, interpret2/1, break2/1, options2/1, quit2/1,
 	 interpret3/1, all_step3/1,all_next3/1,save3/1,restore3/1,finish3/1,
@@ -46,13 +40,8 @@
 	 attach5/1, normal5/1, exit5/1, options5/1,
 	 distsetup6/1, all_step6/1, all_next6/1]).
 
-
-
-
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-
-
 init_per_testcase(_Func, Config) ->
     Dog=test_server:timetrap(60*1000),
     [{watchdog, Dog}|Config].
@@ -65,16 +54,16 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[function_tests, {group, manual_tests}].
+    [dbg_ui, {group, manual_tests}].
 
 groups() -> 
     [{manual_tests, [],
-  [start1, interpret1, quit1, start2, interpret2, break2,
-   options2, interpret3, all_step3, all_next3, save3,
-   restore3, finish3, killinit3, killone3, killall3,
-   deleteone3, deleteall3, viewbreak4, delete4, attach5,
-   normal5, exit5, options5, distsetup6, all_step6,
-   all_next6]}].
+      [start1, interpret1, quit1, start2, interpret2, break2,
+       options2, interpret3, all_step3, all_next3, save3,
+       restore3, finish3, killinit3, killone3, killall3,
+       deleteone3, deleteall3, viewbreak4, delete4, attach5,
+       normal5, exit5, options5, distsetup6, all_step6,
+       all_next6]}].
 
 init_per_suite(Config) ->
     Config.
@@ -83,20 +72,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
-
-
-
-function_tests (doc) ->
-    ["Tests documented functions"];
-
-function_tests (suite) ->
-    [dbg_ui].
-
-
+    Config.
 
 dbg_ui (doc) ->
     ["Debugger GUI"];
@@ -108,7 +87,7 @@ dbg_ui (_Config) ->
     case os:getenv("DISPLAY") of
 	false ->
 	    {skipped,"No display"};
-	Other when list(Other) ->
+	Other when is_list(Other) ->
 %	    ?line {ok, Pid} = debugger:start (),
 %	    ?line ok = is_pid (Pid),
 %	    ?line true = erlang:is_process_alive(Pid),
@@ -117,11 +96,6 @@ dbg_ui (_Config) ->
 	    {skipped,"Gunilla: Workaround"}
     end.
 
-
-
-
-
-
 %% check/2 - returns the result for the specified testcase.
 %% pass - means the user has run the case, and it passed
 %% fail - means the user has run the case, and it failed
@@ -186,14 +160,6 @@ check(Case, Config) ->
 		  ).
 
 
-
-
-
-
-
-
-
-
 %% SET 1
 ?MAN_CASE(start1, "Start the debugger from the toolbar",
 	  "Before proceeding with the test cases, please move or remove
diff --git a/lib/debugger/test/debugger_SUITE.erl b/lib/debugger/test/debugger_SUITE.erl
index 993854db8c..9ae255d2ea 100644
--- a/lib/debugger/test/debugger_SUITE.erl
+++ b/lib/debugger/test/debugger_SUITE.erl
@@ -24,15 +24,17 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
 	 app_test/1,erts_debug/1,encrypted_debug_info/1,
 	 no_abstract_code/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[app_test, erts_debug, no_abstract_code,
- encrypted_debug_info].
+    [app_test, erts_debug, no_abstract_code,
+     encrypted_debug_info].
 
 groups() -> 
     [].
@@ -44,10 +46,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index 44b7e52a2f..b8d66d698d 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -17,7 +17,8 @@
 %% %CopyrightEnd%
 
 -module(erl_eval_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([guard_1/1, guard_2/1,
 	 match_pattern/1,
@@ -73,11 +74,11 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[guard_1, guard_2, match_pattern, string_plusplus,
- pattern_expr, match_bin, guard_3, guard_4, lc,
- simple_cases, unary_plus, apply_atom, otp_5269,
- otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
- otp_8133, funs, try_catch, eval_expr_5].
+    [guard_1, guard_2, match_pattern, string_plusplus,
+     pattern_expr, match_bin, guard_3, guard_4, lc,
+     simple_cases, unary_plus, apply_atom, otp_5269,
+     otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
+     otp_8133, funs, try_catch, eval_expr_5].
 
 groups() -> 
     [].
@@ -89,10 +90,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 guard_1(doc) ->
diff --git a/lib/debugger/test/exception_SUITE.erl b/lib/debugger/test/exception_SUITE.erl
index e4e0897240..cb7c55ee2a 100644
--- a/lib/debugger/test/exception_SUITE.erl
+++ b/lib/debugger/test/exception_SUITE.erl
@@ -20,7 +20,9 @@
 %%
 -module(exception_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 badmatch/1,pending_errors/1,nil_arith/1]).
 
 -export([bad_guy/2]).
@@ -30,20 +32,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[badmatch, pending_errors, nil_arith].
+    [badmatch, pending_errors, nil_arith].
 
 -define(try_match(E),
 	catch ?MODULE:bar(),
@@ -62,7 +64,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/fun_SUITE.erl b/lib/debugger/test/fun_SUITE.erl
index e56df5fb09..673de5bead 100644
--- a/lib/debugger/test/fun_SUITE.erl
+++ b/lib/debugger/test/fun_SUITE.erl
@@ -32,21 +32,21 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[good_call, bad_apply, bad_fun_call, badarity,
- ext_badarity, otp_6061].
+    [good_call, bad_apply, bad_fun_call, badarity,
+     ext_badarity, otp_6061].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -61,7 +61,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index 2b32fc702e..36bd5c7137 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -20,7 +20,9 @@
 %%
 -module(guard_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 bad_arith/1,bad_tuple/1,test_heap_guards/1,guard_bifs/1,
 	 type_tests/1,const_guard/1,
 	 const_cond/1,basic_not/1,complex_not/1,
@@ -43,27 +45,27 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[bad_arith, bad_tuple, test_heap_guards, guard_bifs,
- type_tests, const_guard, const_cond, basic_not,
- complex_not, semicolon, complex_semicolon, comma,
- or_guard, more_or_guards, complex_or_guards, and_guard,
- xor_guard, more_xor_guards, build_in_guard,
- old_guard_tests, gbif, t_is_boolean, is_function_2,
- tricky, rel_ops, basic_andalso_orelse, traverse_dcd,
- check_qlc_hrl].
+    [bad_arith, bad_tuple, test_heap_guards, guard_bifs,
+     type_tests, const_guard, const_cond, basic_not,
+     complex_not, semicolon, complex_semicolon, comma,
+     or_guard, more_or_guards, complex_or_guards, and_guard,
+     xor_guard, more_xor_guards, build_in_guard,
+     old_guard_tests, gbif, t_is_boolean, is_function_2,
+     tricky, rel_ops, basic_andalso_orelse, traverse_dcd,
+     check_qlc_hrl].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -78,7 +80,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
index cdbc43daf9..3cfc90f01f 100644
--- a/lib/debugger/test/int_SUITE.erl
+++ b/lib/debugger/test/int_SUITE.erl
@@ -22,7 +22,8 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
@@ -62,11 +63,11 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[interpret, guards, {group, list_suite}, interpretable].
+    [interpret, guards, {group, list_suite}, interpretable].
 
 groups() -> 
     [{list_suite, [], [{group, append}, reverse, member]},
- {append, [], [append_1, append_2]}].
+     {append, [], [append_1, append_2]}].
 
 init_per_suite(Config) ->
     Config.
@@ -75,10 +76,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 interpret(suite) ->
diff --git a/lib/debugger/test/int_break_SUITE.erl b/lib/debugger/test/int_break_SUITE.erl
index 08a643edbd..f8cd542e98 100644
--- a/lib/debugger/test/int_break_SUITE.erl
+++ b/lib/debugger/test/int_break_SUITE.erl
@@ -24,7 +24,9 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
 	 basic/1,cleanup/1]).
 
 -export([auto_attach/1]).
@@ -32,7 +34,7 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[basic, cleanup].
+    [basic, cleanup].
 
 groups() -> 
     [].
@@ -44,10 +46,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index 3deb02f35a..ab72715190 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -22,7 +22,9 @@
 
 %% Purpose: Deeper test of the evaluator.
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2, end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2, end_per_testcase/2,
 	 bifs_outside_erlang/1, spawning/1, applying/1,
 	 catch_and_throw/1, external_call/1, test_module_info/1,
 	 apply_interpreted_fun/1, apply_uninterpreted_fun/1,
@@ -35,13 +37,14 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{suite_callbacks,[ts_install_scb]},
+	    {timetrap,{minutes,1}}].
 
 all() -> 
-[bifs_outside_erlang, spawning, applying,
- catch_and_throw, external_call, test_module_info,
- apply_interpreted_fun, apply_uninterpreted_fun,
- interpreted_exit, otp_8310].
+    [bifs_outside_erlang, spawning, applying,
+     catch_and_throw, external_call, test_module_info,
+     apply_interpreted_fun, apply_uninterpreted_fun,
+     interpreted_exit, otp_8310].
 
 groups() -> 
     [].
@@ -53,24 +56,20 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line {module,?IM} = int:i(filename:join(DataDir, ?IM)),
     ?line ok = io:format("Interpreted modules: ~p",[int:interpreted()]),
-    {ok, Dog} = timer:apply_after(timer:minutes(1),
-				  erlang, exit, [self(), kill]),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, _Config) ->
     ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
-    Dog = ?config(watchdog, Config),
-    timer:cancel(Dog),
     ok.
 
 bifs_outside_erlang(doc) ->
diff --git a/lib/debugger/test/lc_SUITE.erl b/lib/debugger/test/lc_SUITE.erl
index 90ec4474dc..2a31143b4d 100644
--- a/lib/debugger/test/lc_SUITE.erl
+++ b/lib/debugger/test/lc_SUITE.erl
@@ -21,7 +21,9 @@
 -module(lc_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 basic/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -29,20 +31,20 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[basic].
+    [basic].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -57,7 +59,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/record_SUITE.erl b/lib/debugger/test/record_SUITE.erl
index 89f4b0ad74..e17ad74e5b 100644
--- a/lib/debugger/test/record_SUITE.erl
+++ b/lib/debugger/test/record_SUITE.erl
@@ -24,26 +24,28 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 errors/1,record_test/1,eval_once/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[errors, record_test, eval_once].
+    [errors, record_test, eval_once].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -58,7 +60,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
diff --git a/lib/debugger/test/trycatch_SUITE.erl b/lib/debugger/test/trycatch_SUITE.erl
index 8e2619e8e7..3d5dd9a615 100644
--- a/lib/debugger/test/trycatch_SUITE.erl
+++ b/lib/debugger/test/trycatch_SUITE.erl
@@ -20,7 +20,9 @@
 %%
 -module(trycatch_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,init_per_suite/1,end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
 	 basic/1,lean_throw/1,try_of/1,try_after/1,%after_bind/1,
 	 catch_oops/1,after_oops/1,eclectic/1,rethrow/1,
 	 nested_of/1,nested_catch/1,nested_after/1]).
@@ -30,22 +32,22 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[cases()].
+    cases().
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cases() -> 
-[basic, lean_throw, try_of, try_after, catch_oops,
- after_oops, eclectic, rethrow, nested_of, nested_catch,
- nested_after].
+    [basic, lean_throw, try_of, try_after, catch_oops,
+     after_oops, eclectic, rethrow, nested_of, nested_catch,
+     nested_after].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -60,7 +62,7 @@ end_per_testcase(_Case, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     ?line test_lib:interpret(?MODULE),
     ?line true = lists:member(?MODULE, int:interpreted()),
-    ok.
+    Config.
 
 end_per_suite(Config) when is_list(Config) ->
     ok.
@@ -123,9 +125,7 @@ basic(Conf) when is_list(Conf) ->
 
     ok.
 
-after_csuite() -> [{suite_callbacks,[ts_install_scb]}].
-
-all() ->
+after_call() ->
     put(basic, after_was_called).
 
 after_clean() ->