Update stdlib tests to conform with common_test standard

1 files changed, 40 insertions, 29 deletions

diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index ac1c735b2e..d34ceba4e6 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -43,7 +43,7 @@
 -define(testcase, current_testcase). % don't know
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -define(testcase, ?config(?TESTCASE, Config)).
@@ -51,35 +51,35 @@
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
 
--export([parse_transform/1, 
+-export([ 
              badarg/1, nested_qlc/1, unused_var/1, lc/1, fun_clauses/1,
              filter_var/1, single/1, exported_var/1, generator_vars/1,
              nomatch/1, errors/1, pattern/1, 
 
-         evaluation/1, 
+ 
              eval/1, cursor/1, fold/1, eval_unique/1, eval_cache/1, append/1, 
              evaluator/1, string_to_handle/1, table/1, process_dies/1, 
              sort/1, keysort/1, filesort/1, cache/1, cache_list/1, filter/1, 
              info/1, nested_info/1, lookup1/1, lookup2/1, lookup_rec/1, 
              indices/1, pre_fun/1, skip_filters/1,
 
-         table_impls/1,
+
              ets/1, dets/1,
 
-         join/1,
+
              join_option/1, join_filter/1, join_lookup/1, join_merge/1,
              join_sort/1, join_complex/1,
 
-         tickets/1,
+
              otp_5644/1, otp_5195/1, otp_6038_bug/1, otp_6359/1, otp_6562/1,
              otp_6590/1, otp_6673/1, otp_6964/1, otp_7114/1, otp_7238/1,
              otp_7232/1, otp_7552/1, otp_6674/1, otp_7714/1,
 
          manpage/1,
 
-         compat/1,
+
              backward/1, forward/1]).
 
 %% Internal exports.
@@ -119,12 +119,39 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> 
-    [parse_transform, evaluation, table_impls, join, tickets, manpage, compat].
+all() -> 
+[{group, parse_transform}, {group, evaluation},
+ {group, table_impls}, {group, join}, {group, tickets},
+ manpage, {group, compat}].
+
+groups() -> 
+    [{parse_transform, [],
+  [badarg, nested_qlc, unused_var, lc, fun_clauses,
+   filter_var, single, exported_var, generator_vars,
+   nomatch, errors, pattern]},
+ {evaluation, [],
+  [eval, cursor, fold, eval_unique, eval_cache, append,
+   evaluator, string_to_handle, table, process_dies, sort,
+   keysort, filesort, cache, cache_list, filter, info,
+   nested_info, lookup1, lookup2, lookup_rec, indices,
+   pre_fun, skip_filters]},
+ {table_impls, [], [ets, dets]},
+ {join, [],
+  [join_option, join_filter, join_lookup, join_merge,
+   join_sort, join_complex]},
+ {tickets, [],
+  [otp_5644, otp_5195, otp_6038_bug, otp_6359, otp_6562,
+   otp_6590, otp_6673, otp_6964, otp_7114, otp_7232,
+   otp_7238, otp_7552, otp_6674, otp_7714]},
+ {compat, [], [backward, forward]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
-parse_transform(suite) ->
-    [badarg, nested_qlc, unused_var, lc, fun_clauses, filter_var,
-     single, exported_var, generator_vars, nomatch, errors, pattern].
 
 badarg(doc) ->
     "Badarg.";
@@ -461,11 +488,6 @@ pattern(Config) when is_list(Config) ->
                          -record(k, {t,v}).\n">>, Ts),
     ok.
 
-evaluation(suite) ->
-    [eval, cursor, fold, eval_unique, eval_cache, append, evaluator, 
-     string_to_handle, table, process_dies, sort, keysort, filesort, cache,
-     cache_list, filter, info, nested_info, lookup1, lookup2, lookup_rec, 
-     indices, pre_fun, skip_filters].
 
 eval(doc) ->
     "eval/2";
@@ -4297,8 +4319,6 @@ skip_filters(Config) when is_list(Config) ->
 
     ok.
 
-table_impls(suite) ->
-    [ets, dets].
 
 ets(doc) ->
     "ets:table/1,2.";
@@ -4445,9 +4465,6 @@ dets(Config) when is_list(Config) ->
     _ = file:delete(Fname),
     ok.
 
-join(suite) ->
-    [join_option, join_filter, join_lookup, join_merge, 
-     join_sort, join_complex].
 
 join_option(doc) ->
     "The 'join' option (any, lookup, merge, nested_loop). Also cache/unique.";
@@ -5729,10 +5746,6 @@ join_complex(Config) when is_list(Config) ->
 
     ok.
 
-tickets(suite) ->
-    [otp_5644, otp_5195, otp_6038_bug, otp_6359, otp_6562, otp_6590, 
-     otp_6673, otp_6964, otp_7114, otp_7232, otp_7238, otp_7552, otp_6674,
-     otp_7714].
 
 otp_5644(doc) ->
     "OTP-5644. Handle the new language element M:F/A.";
@@ -7378,8 +7391,6 @@ gb_iter(I0, N, EFun) ->
     end.
     ">>.
 
-compat(suite) ->
-    [backward, forward].
 
 backward(doc) ->
     "OTP-6674. Join info and extra constants.";