Update kernel tests to conform with common_test standard

1 files changed, 17 insertions, 9 deletions

diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index af538b0b8b..ecfc8f8fd0 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -18,13 +18,13 @@
 %%
 -module(init_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([get_arguments/1, get_argument/1, boot_var/1, restart/1,
 	 get_plain_arguments/1,
-	 reboot/1, stop/1, get_status/1, script_id/1, boot/1]).
+	 reboot/1, stop/1, get_status/1, script_id/1]).
 -export([boot1/1, boot2/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -38,11 +38,20 @@
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
-all(suite) ->
-    [get_arguments, get_argument, boot_var,
-     get_plain_arguments,
-     restart,
-     get_status, script_id, boot].
+all() -> 
+[get_arguments, get_argument, boot_var,
+ get_plain_arguments, restart, get_status, script_id,
+ {group, boot}].
+
+groups() -> 
+    [{boot, [], [boot1, boot2]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:seconds(?DEFAULT_TIMEOUT_SEC)),
@@ -488,7 +497,6 @@ script_id(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% Start the slave system with -boot flag.
 %% ------------------------------------------------
-boot(suite) -> [boot1, boot2].
 
 boot1(doc) -> [];
 boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};