Update os_mon tests to conform with common_test standard

1 files changed, 23 insertions, 14 deletions

diff --git a/lib/os_mon/test/memsup_SUITE.erl b/lib/os_mon/test/memsup_SUITE.erl
index 01a7f6c7f2..dc7af32746 100644
--- a/lib/os_mon/test/memsup_SUITE.erl
+++ b/lib/os_mon/test/memsup_SUITE.erl
@@ -17,10 +17,10 @@
 %% %CopyrightEnd%
 %%
 -module(memsup_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -49,18 +49,27 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     Config.
 
-all(suite) ->
-    All = case ?t:os_type() of
-	      {unix, sunos} ->
-		  [api, alarm1, alarm2, process,
-		   config, timeout, unavailable, port];
-	      {unix, linux} ->
-		  [api, alarm1, alarm2, process, timeout];
-	      _OS ->
-		  [api, alarm1, alarm2, process]
-	  end,
-    Bugs = [otp_5910],
-    All ++ Bugs.
+all() -> 
+All = case test_server:os_type() of
+	{unix, sunos} ->
+	    [api, alarm1, alarm2, process, config, timeout,
+	     unavailable, port];
+	{unix, linux} ->
+	    [api, alarm1, alarm2, process, timeout];
+	_OS -> [api, alarm1, alarm2, process]
+      end,
+	Bugs = [otp_5910],
+	All ++ Bugs.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 api(suite) ->
     [];