Update stdlib tests to conform with common_test standard

1 files changed, 34 insertions, 25 deletions

diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index a5911ec9c5..c06bcb18ce 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -17,20 +17,20 @@
 %% %CopyrightEnd%
 %%
 -module(shell_SUITE).
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([forget/1, records/1, known_bugs/1, otp_5226/1, otp_5327/1,
                  otp_5435/1, otp_5195/1, otp_5915/1, otp_5916/1,
-         bits/1, bs_match_misc_SUITE/1, bs_match_int_SUITE/1,
+ bs_match_misc_SUITE/1, bs_match_int_SUITE/1,
                  bs_match_tail_SUITE/1, bs_match_bin_SUITE/1,
                  bs_construct_SUITE/1,
-         refman/1, refman_bit_syntax/1, 
-         progex/1, progex_bit_syntax/1, progex_records/1, 
+ refman_bit_syntax/1, 
+ progex_bit_syntax/1, progex_records/1, 
                    progex_lc/1, progex_funs/1,
-         tickets/1, otp_5990/1, otp_6166/1, otp_6554/1, otp_6785/1,
+ otp_5990/1, otp_6166/1, otp_6554/1, otp_6785/1,
                     otp_7184/1, otp_7232/1, otp_8393/1]).
 
--export([restricted/1, start_restricted_from_shell/1, 
+-export([ start_restricted_from_shell/1, 
 	 start_restricted_on_command_line/1,restricted_local/1]).
 
 %% Internal export.
@@ -50,7 +50,7 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -export([init_per_testcase/2, end_per_testcase/2]).
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
@@ -71,18 +71,36 @@ end_per_testcase(_Case, Config) ->
     ok.
 -endif.
 
-all(doc) ->
-    ["Test cases for the 'shell' module."];
-all(suite) ->
-    [forget, records, known_bugs, otp_5226, otp_5327, otp_5435, otp_5195,
-     otp_5915, otp_5916, bits, refman, progex, tickets, restricted].
+all() -> 
+[forget, records, known_bugs, otp_5226, otp_5327,
+ otp_5435, otp_5195, otp_5915, otp_5916, {group, bits},
+ {group, refman}, {group, progex}, {group, tickets},
+ {group, restricted}].
+
+groups() -> 
+    [{restricted, [],
+  [start_restricted_from_shell,
+   start_restricted_on_command_line, restricted_local]},
+ {bits, [],
+  [bs_match_misc_SUITE, bs_match_tail_SUITE,
+   bs_match_bin_SUITE, bs_construct_SUITE]},
+ {refman, [], [refman_bit_syntax]},
+ {progex, [],
+  [progex_bit_syntax, progex_records, progex_lc,
+   progex_funs]},
+ {tickets, [],
+  [otp_5990, otp_6166, otp_6554, otp_6785, otp_7184,
+   otp_7232, otp_8393]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 -record(state, {bin, reply, leader}).
 
-restricted(doc) ->
-    ["Test restricted_shell"];
-restricted(suite) ->
-    [start_restricted_from_shell,start_restricted_on_command_line,restricted_local].
 
 start_restricted_from_shell(doc) ->
     ["Test that a restricted shell can be started from the normal shell"];
@@ -797,9 +815,6 @@ otp_5916(Config) when is_list(Config) ->
     [ok] = scan(C),
     ok.
 
-bits(suite) ->
-    [bs_match_misc_SUITE, % bs_match_int_SUITE/,
-     bs_match_tail_SUITE, bs_match_bin_SUITE, bs_construct_SUITE].
 
 bs_match_misc_SUITE(doc) ->
     ["OTP-5327. Adopted from parts of emulator/test/bs_match_misc_SUITE.erl."];
@@ -1520,8 +1535,6 @@ evaluate(Str, Vars) ->
 	    Result
     end.
 
-refman(suite) ->
-    [refman_bit_syntax].
 
 refman_bit_syntax(doc) ->
     ["Bit syntax examples from the Reference Manual. OTP-5237."];
@@ -1564,8 +1577,6 @@ refman_bit_syntax(Config) when is_list(Config) ->
     ?line <<2,4,6>> =  << << (X*2) >> || <<X>> <= << 1,2,3 >> >>,
     ok.
 
-progex(suite) ->
-    [progex_bit_syntax, progex_records, progex_lc, progex_funs].
 
 -define(IP_VERSION, 4).
 -define(IP_MIN_HDR_LEN, 5).
@@ -2256,8 +2267,6 @@ progex_funs(Config) when is_list(Config) ->
     ?line [ok] = scan(Test2_shell),
     ok.
 
-tickets(suite) ->
-    [otp_5990, otp_6166, otp_6554, otp_6785, otp_7184, otp_7232, otp_8393].
 
 otp_5990(doc) ->
     "OTP-5990. {erlang,is_record}.";