1 files changed, 31 insertions, 26 deletions
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index e7cfc65be1..a8b252f081 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-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
@@ -19,7 +19,7 @@
 
 -module(array_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 %% This should be set relatively high (10-15 times the expected
@@ -27,8 +27,9 @@
 -define(default_timeout, ?t:seconds(60)).
 
 %% Test server specific exports
--export([all/1]).
--export([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]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([
   	 new_test/1,
@@ -64,33 +65,37 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [new_test,
-     fix_test,
-     relax_test,
-     resize_test,
-     set_get_test,
-     to_list_test,
-     sparse_to_list_test,
-     from_list_test,
-     to_orddict_test,
-     sparse_to_orddict_test,
-     from_orddict_test,
-     map_test,
-     sparse_map_test,
-     foldl_test,
-     sparse_foldl_test,
-     foldr_test,
-     sparse_foldr_test
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [new_test, fix_test, relax_test, resize_test,
+     set_get_test, to_list_test, sparse_to_list_test,
+     from_list_test, to_orddict_test, sparse_to_orddict_test,
+     from_orddict_test, map_test, sparse_map_test,
+     foldl_test, sparse_foldl_test, foldr_test,
+     sparse_foldr_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server: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.