Merge branch 'dev' into bmk/snmp/snmpc/OTP-9004

5 files changed, 77 insertions, 38 deletions

diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index 19354b87b2..2d9d0a71e5 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -71,7 +71,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) parsetools.spec $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) parsetools.spec parsetools.cover $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	# @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 069f780b5e..066d221ae7 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,17 +30,19 @@
 -define(privdir, "leex_SUITE_priv").
 -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)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_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]).
 
--export([checks/1,
-             file/1, compile/1, syntax/1,
-         examples/1,
-             pt/1, man/1, ex/1, ex2/1, not_yet/1]).
+-export([
+	 file/1, compile/1, syntax/1,
+	 
+	 pt/1, man/1, ex/1, ex2/1, not_yet/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -49,15 +51,33 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [checks, examples].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, checks}, {group, examples}].
+
+groups() -> 
+    [{checks, [], [file, compile, syntax]},
+     {examples, [], [pt, man, ex, ex2, not_yet]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-checks(suite) ->
-    [file, compile, syntax].
 
 file(doc) ->
     "Bad files and options.";
@@ -330,8 +350,6 @@ syntax(Config) when is_list(Config) ->
         leex:file(Filename, Ret),
     ok.
 
-examples(suite) ->
-    [pt,man,ex,ex2,not_yet].
 
 pt(doc) ->
     "Pushing back characters.";
diff --git a/lib/parsetools/test/parsetools.cover b/lib/parsetools/test/parsetools.cover
new file mode 100644
index 0000000000..13f84e3ba6
--- /dev/null
+++ b/lib/parsetools/test/parsetools.cover
@@ -0,0 +1,2 @@
+{incl_app,parsetools,details}.
+
diff --git a/lib/parsetools/test/parsetools.spec b/lib/parsetools/test/parsetools.spec
index 5b34633378..870d57baf1 100644
--- a/lib/parsetools/test/parsetools.spec
+++ b/lib/parsetools/test/parsetools.spec
@@ -1 +1 @@
-{topcase, {dir, "../parsetools_test"}}.
+{suites,"../parsetools_test",all}.
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 8153be7e61..8e27ddb13d 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -29,24 +29,26 @@
 -define(privdir, "yecc_SUITE_priv").
 -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)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_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]).
 
 -export([app_test/1,
-         checks/1, 
-             file/1, syntax/1, compile/1, rules/1, expect/1,
-             conflicts/1,
-         examples/1,
-             empty/1, prec/1, yeccpre/1, lalr/1, old_yecc/1, 
-             other_examples/1,
-         bugs/1, 
-             otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
-         improvements/1,
-             otp_7292/1, otp_7969/1, otp_8919/1]).
+	 
+	 file/1, syntax/1, compile/1, rules/1, expect/1,
+	 conflicts/1,
+	 
+	 empty/1, prec/1, yeccpre/1, lalr/1, old_yecc/1, 
+	 other_examples/1,
+	 
+	 otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
+	 
+	 otp_7292/1, otp_7969/1, otp_8919/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -55,12 +57,38 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [app_test, checks, examples, bugs, improvements].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test, {group, checks}, {group, examples},
+     {group, bugs}, {group, improvements}].
+
+groups() -> 
+    [{checks, [],
+      [file, syntax, compile, rules, expect, conflicts]},
+     {examples, [],
+      [empty, prec, yeccpre, lalr, old_yecc, other_examples]},
+     {bugs, [],
+      [otp_5369, otp_6362, otp_7945, otp_8483, otp_8486]},
+     {improvements, [], [otp_7292, otp_7969, otp_8919]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 app_test(doc) ->
     ["Tests the applications consistency."];
@@ -70,8 +98,6 @@ app_test(Config) when is_list(Config) ->
     ?line ok=?t:app_test(parsetools),
     ok.
 
-checks(suite) ->
-    [file, syntax, compile, rules, expect, conflicts].
 
 file(doc) ->
     "Bad files and options.";
@@ -730,8 +756,6 @@ rules(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-examples(suite) ->
-    [empty, prec, yeccpre, lalr, old_yecc, other_examples].
 
 expect(doc) ->
     "Check of expect.";
@@ -1283,8 +1307,6 @@ other_examples(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-bugs(suite) ->
-    [otp_5369, otp_6362, otp_7945, otp_8483, otp_8486].
 
 otp_5369(doc) ->
     "OTP-5369. A bug in parse_and_scan reported on erlang questions.";
@@ -1540,9 +1562,6 @@ otp_8486(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-improvements(suite) ->
-    [otp_7292, otp_7969, otp_8919].
-
 otp_7292(doc) ->
     "OTP-7292. Header declarations for edoc.";
 otp_7292(suite) -> [];