[megaco|test] Removed the "compile all" compiler directive (load)

Removed the "compile all" compiler directive for the load
megaco test suite.

1 files changed, 54 insertions, 30 deletions

diff --git a/lib/megaco/test/megaco_load_test.erl b/lib/megaco/test/megaco_load_test.erl
index b2c799b929..66ee4931f2 100644
--- a/lib/megaco/test/megaco_load_test.erl
+++ b/lib/megaco/test/megaco_load_test.erl
@@ -24,7 +24,33 @@
 %%----------------------------------------------------------------------
 -module(megaco_load_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         single_user_light_load/1,
+         single_user_medium_load/1,
+         single_user_heavy_load/1,
+         single_user_extreme_load/1,
+
+         multi_user_light_load/1,
+         multi_user_medium_load/1,
+         multi_user_heavy_load/1,
+         multi_user_extreme_load/1,
+
+         t/0, t/1
+        ]).
+
+-export([
+         do_multi_load/3,
+         multi_load_collector/7
+        ]).
+
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -66,8 +92,6 @@
 t()     -> megaco_test_lib:t(?MODULE).
 t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
-min(M) -> timer:minutes(M).
-
 %% Test server callbacks
 init_per_testcase(single_user_light_load = Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
@@ -108,15 +132,33 @@ end_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-    [single_user_light_load,
-     single_user_medium_load, single_user_heavy_load,
-     single_user_extreme_load, multi_user_light_load,
-     multi_user_medium_load, multi_user_heavy_load,
-     multi_user_extreme_load].
+    [
+     {group, single},
+     {group, multi}
+    ].
 
 groups() -> 
-    [].
-
+    [
+     {single, [], single_cases()},
+     {multi,  [], multi_cases()}
+    ].
+
+single_cases() ->
+    [
+     single_user_light_load,
+     single_user_medium_load,
+     single_user_heavy_load,
+     single_user_extreme_load
+    ].
+
+multi_cases() ->
+    [
+     multi_user_light_load,
+     multi_user_medium_load,
+     multi_user_heavy_load,
+     multi_user_extreme_load
+    ].
+    
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -629,15 +671,6 @@ make_mids([MgNode|MgNodes], Mids) ->
 	    exit("Test node must be started with '-sname'")
     end.
 
-tim() ->
-    %% {A,B,C} = erlang:now(),
-    %% A*1000000000+B*1000+(C div 1000).
-    erlang:monotonic_time(milli_seconds).
-
-sleep(X) -> receive after X -> ok end.
-
-error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
 maybe_display_system_info(NumLoaders) when NumLoaders > 50 ->
     [{display_system_info, timer:seconds(2)}];
 maybe_display_system_info(NumLoaders) when NumLoaders > 10 ->
@@ -648,6 +681,8 @@ maybe_display_system_info(_) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+min(M) -> timer:minutes(M).
+
 i(F) ->
     i(F, []).
 
@@ -675,14 +710,3 @@ print(_, _, _, _, _) ->
     ok.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-random_init() ->
-    ok.
-
-random() ->
-    10 * rand:uniform(50).
-
-apply_load_timer() ->
-    erlang:send_after(random(), self(), apply_load_timeout).
-