Update kernel tests to conform with common_test standard

1 files changed, 46 insertions, 36 deletions

diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 1688ec45ca..9d0d704b92 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -17,17 +17,17 @@
 %% %CopyrightEnd%
 %%
 -module(prim_file_SUITE).
--export([all/1,
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
 	init/1, fini/1,
-	read_write_file/1, dirs/1, files/1]).
+	read_write_file/1]).
 -export([cur_dir_0a/1, cur_dir_0b/1, 
 	 cur_dir_1a/1, cur_dir_1b/1, 
 	 make_del_dir_a/1, make_del_dir_b/1,
-	 pos/1, pos1/1, pos2/1]).
+	 pos1/1, pos2/1]).
 -export([close/1, 
 	 delete_a/1, delete_b/1]).
--export([open/1, open1/1, modes/1]).
--export([file_info/1, 
+-export([ open1/1, modes/1]).
+-export([ 
 	 file_info_basic_file_a/1, file_info_basic_file_b/1,
 	 file_info_basic_directory_a/1, file_info_basic_directory_b/1,
 	 file_info_bad_a/1, file_info_bad_b/1, 
@@ -36,13 +36,13 @@
 -export([rename_a/1, rename_b/1, 
 	 access/1, truncate/1, datasync/1, sync/1,
 	 read_write/1, pread_write/1, append/1, exclusive/1]).
--export([errors/1, e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
+-export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 
--export([compression/1, read_not_really_compressed/1,
+-export([ read_not_really_compressed/1,
 	 read_compressed/1, write_compressed/1,
 	 compress_errors/1]).
 
--export([links/1, 
+-export([ 
 	 make_link_a/1, make_link_b/1,
 	 read_link_info_for_non_link/1, 
 	 symlinks_a/1, symlinks_b/1,
@@ -50,7 +50,7 @@
 
 -export([advise/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(PRIM_FILE, prim_file).
@@ -67,12 +67,43 @@
 	    _ ->  apply(?PRIM_FILE, F, [H | A])
 	end).
 
-all(suite) -> {req, [kernel],
-	       {conf, init,
-		[read_write_file, dirs, files, 
-		 delete_a, delete_b, rename_a, rename_b, errors,
-		 compression, links, list_dir_limit],
-		fini}}.
+all() -> 
+[read_write_file, {group, dirs}, {group, files},
+ delete_a, delete_b, rename_a, rename_b, {group, errors},
+ {group, compression}, {group, links}, list_dir_limit].
+
+groups() -> 
+    [{dirs, [],
+  [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
+   cur_dir_1a, cur_dir_1b]},
+ {files, [],
+  [{group, open}, {group, pos}, {group, file_info},
+   truncate, sync, datasync, advise]},
+ {open, [],
+  [open1, modes, close, access, read_write, pread_write,
+   append, exclusive]},
+ {pos, [], [pos1, pos2]},
+ {file_info, [],
+  [file_info_basic_file_a, file_info_basic_file_b,
+   file_info_basic_directory_a,
+   file_info_basic_directory_b, file_info_bad_a,
+   file_info_bad_b, file_info_times_a, file_info_times_b,
+   file_write_file_info_a, file_write_file_info_b]},
+ {errors, [],
+  [e_delete, e_rename, e_make_dir, e_del_dir]},
+ {compression, [],
+  [read_compressed, read_not_really_compressed,
+   write_compressed, compress_errors]},
+ {links, [],
+  [make_link_a, make_link_b, read_link_info_for_non_link,
+   symlinks_a, symlinks_b]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init(Config) when is_list(Config) ->
     case os:type() of
@@ -190,9 +221,6 @@ read_write_file(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-dirs(suite) -> [make_del_dir_a, make_del_dir_b, 
-		cur_dir_0a, cur_dir_0b, 
-		cur_dir_1a, cur_dir_1b].
 
 make_del_dir_a(suite) -> [];
 make_del_dir_a(doc) -> [];
@@ -382,10 +410,7 @@ win_cur_dir_1(_Config, Handle) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files(suite) -> [open,pos,file_info,truncate,sync,datasync,advise].
 
-open(suite) -> [open1,modes,close,access,read_write,
-	       pread_write,append,exclusive].
 
 open1(suite) -> [];
 open1(doc) -> [];
@@ -628,7 +653,6 @@ exclusive(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-pos(suite) -> [pos1,pos2].
 
 pos1(suite) -> [];
 pos1(doc) -> [];
@@ -716,12 +740,6 @@ pos2(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-file_info(suite) -> [file_info_basic_file_a, file_info_basic_file_b,
-		     file_info_basic_directory_a, 
-		     file_info_basic_directory_b,
-		     file_info_bad_a, file_info_bad_b, 
-		     file_info_times_a, file_info_times_b, 
-		     file_write_file_info_a, file_write_file_info_b].
 
 file_info_basic_file_a(suite) -> [];
 file_info_basic_file_a(doc) -> [];
@@ -1298,7 +1316,6 @@ rename(Config, Handle, Suffix) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-errors(suite) -> [e_delete, e_rename, e_make_dir, e_del_dir].
 
 e_delete(suite) -> [];
 e_delete(doc) -> [];
@@ -1550,8 +1567,6 @@ e_del_dir(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-compression(suite) -> [read_compressed, read_not_really_compressed,
-		       write_compressed, compress_errors].
 
 %% Trying reading and positioning from a compressed file.
 
@@ -1704,11 +1719,6 @@ compress_errors(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-links(doc) -> "Test the link functions.";
-links(suite) -> 
-    [make_link_a, make_link_b, 
-     read_link_info_for_non_link, 
-     symlinks_a, symlinks_b].
 
 make_link_a(doc) -> "Test creating a hard link.";
 make_link_a(suite) -> [];