Merge branch 'egil/erts/cuddle-tests'

* egil/erts/cuddle-tests:
  Additional logging for alloc_SUITE
  Replace test_server:os_type/0 with os:type/0
  Let low_prio test run a bit longer
  Increase timetrap for atom_roundtrip_r15b
  Remove unnecessary ct boilerplate in suite
  Don't divide by zero in test logging
  Use ct:fail/1 instead of test_server:fail/1
  Relax node_container_SUITE
  Increase timetrap timeout for op_SUITE:bsl_bsr/1
  Increase timetrap timeout for port_SUITE:huge_env/1

10 files changed, 54 insertions, 71 deletions

diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 1f690c5015..03b020c521 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -55,21 +55,13 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%                                                                        %%
 
 basic(Cfg) -> drv_case(Cfg).
-
 coalesce(Cfg) -> drv_case(Cfg).
-
 threads(Cfg) -> drv_case(Cfg).
-
 realloc_copy(Cfg) -> drv_case(Cfg).
-
 bucket_index(Cfg) -> drv_case(Cfg).
-
 bucket_mask(Cfg) -> drv_case(Cfg).
-
 rbtree(Cfg) -> drv_case(Cfg).
-
 mseg_clear_cache(Cfg) -> drv_case(Cfg).
-
 cpool(Cfg) -> drv_case(Cfg).
 
 migration(Cfg) ->
@@ -81,7 +73,7 @@ migration(Cfg) ->
     end.
 
 erts_mmap(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{unix, _} ->
 	    [erts_mmap_do(Config, SCO, SCRPM, SCRFSD)
 	     || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]];
@@ -109,25 +101,26 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
     {ok, Node} = start_node(Config, Opts),
     Self = self(),
     Ref = make_ref(),
-    F = fun () ->
-		SI = erlang:system_info({allocator,mseg_alloc}),
-		{erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI),
-		{supercarrier,SC} = lists:keyfind(supercarrier, 1, EM),
-		{sizes,Sizes} = lists:keyfind(sizes, 1, SC),
-		{free_segs,Segs} = lists:keyfind(free_segs,1,SC),
-		{total,Total} = lists:keyfind(total,1,Sizes),
-		Total = SCS*1024*1024,
-
-		{reserved,Reserved} = lists:keyfind(reserved,1,Segs),
-		true = (Reserved >= SCRFSD),
-
-		case {SCO,lists:keyfind(os,1,EM)} of
-		    {true, false} -> ok;
-		    {false, {os,_}} -> ok
-		end,
-
-		Self ! {Ref, ok}
-	end,
+    F = fun() ->
+                SI = erlang:system_info({allocator,mseg_alloc}),
+                {erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI),
+                {supercarrier,SC} = lists:keyfind(supercarrier, 1, EM),
+                {sizes,Sizes} = lists:keyfind(sizes, 1, SC),
+                {free_segs,Segs} = lists:keyfind(free_segs,1,SC),
+                {total,Total} = lists:keyfind(total,1,Sizes),
+                io:format("Expecting total ~w, got ~w~n", [SCS*1024*1024,Total]),
+                Total = SCS*1024*1024,
+
+                {reserved,Reserved} = lists:keyfind(reserved,1,Segs),
+                true = (Reserved >= SCRFSD),
+
+                case {SCO,lists:keyfind(os,1,EM)} of
+                    {true, false} -> ok;
+                    {false, {os,_}} -> ok
+                end,
+
+                Self ! {Ref, ok}
+        end,
 
     spawn_link(Node, F),
     Result = receive {Ref, Rslt} -> Rslt end,
@@ -144,7 +137,7 @@ drv_case(Config) ->
     drv_case(Config, one_shot, "").
 
 drv_case(Config, Mode, NodeOpts) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
 	{Family, _} when Family == unix; Family == win32 ->
 	    {ok, Node} = start_node(Config, NodeOpts),
 	    Self = self(),
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index f116ec979b..b068a4c8d2 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -1034,6 +1034,7 @@ atom_roundtrip(Config) when is_list(Config) ->
 atom_roundtrip_r15b(Config) when is_list(Config) ->
     case test_server:is_release_available("r15b") of
         true ->
+            ct:timetrap({minutes, 6}),
             AtomData = atom_data(),
             verify_atom_data(AtomData),
             {ok, Node} = start_node(Config, [], "r15b"),
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index 41a761229c..294d9ee05f 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -65,7 +65,7 @@ drv_case(Config, CaseName, Command, TimeTrap) when is_list(Config),
                                                    is_atom(CaseName),
                                                    is_list(Command),
                                                    is_integer(TimeTrap) ->
-    case test_server:os_type() of
+    case os:type() of
         {Family, _} when Family == unix; Family == win32 ->
             run_drv_case(Config, CaseName, Command, TimeTrap);
         SkipOs ->
diff --git a/erts/emulator/test/ignore_cores.erl b/erts/emulator/test/ignore_cores.erl
index 7373303a39..da6f6850c6 100644
--- a/erts/emulator/test/ignore_cores.erl
+++ b/erts/emulator/test/ignore_cores.erl
@@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
     end,
     ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
     %% cores are dumped in /cores on MacOS X
-    CoresDir = case {test_server:os_type(), filelib:is_dir("/cores")} of
+    CoresDir = case {os:type(), filelib:is_dir("/cores")} of
 		   {{unix,darwin}, true} ->
 		       filelib:fold_files("/cores",
 					  "^core.*$",
diff --git a/erts/emulator/test/multi_load_SUITE.erl b/erts/emulator/test/multi_load_SUITE.erl
index 784b239116..e8769ea208 100644
--- a/erts/emulator/test/multi_load_SUITE.erl
+++ b/erts/emulator/test/multi_load_SUITE.erl
@@ -19,32 +19,16 @@
 %%
 
 -module(multi_load_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
-	 init_per_group/2,end_per_group/2,
-	 many/1,on_load/1,errors/1]).
+-export([all/0, suite/0, many/1, on_load/1, errors/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() ->
     [many,on_load,errors].
 
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 many(_Config) ->
     Ms = make_modules(100, fun many_module/1),
 
@@ -57,7 +41,6 @@ many(_Config) ->
     io:put_chars("Heavy load\n"
 		 "=========="),
     many_measure(Ms),
-
     ok.
 
 many_module(M) ->
@@ -81,9 +64,12 @@ many_measure(Ms) ->
 	      "Sequential: ~9w µs\n"
 	      "Parallel:   ~9w µs\n"
 	      "Ratio:      ~9w\n",
-	      [length(Ms),Us1,Us2,round(Us1/Us2)]),
+	      [length(Ms),Us1,Us2,divide(Us1,Us2)]),
     ok.
 
+divide(A,B) when B > 0 -> A div B;
+divide(_,_) -> inf.
+
 many_load_seq(Ms) ->
     [erlang:finish_loading([M]) || M <- Ms],
     ok.
@@ -135,7 +121,6 @@ on_load(_Config) ->
     SingleOnPrep = tl(OnPrep),
     {on_load,[OnLoadMod]} = erlang:finish_loading(SingleOnPrep),
     ok = erlang:call_on_load_function(OnLoadMod),
-
     ok.
 
 on_load_module(M) ->
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 71400142af..662e5423b9 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -28,8 +28,6 @@
 -module(node_container_SUITE).
 -author('[email protected]').
 
-%-define(line_trace, 1).
-
 -include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0, init_per_suite/1, end_per_suite/1,
@@ -56,7 +54,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap, {minutes, 10}}].
+     {timetrap, {minutes, 12}}].
 
 
 all() -> 
@@ -712,7 +710,7 @@ run_otp_4715(Config) when is_list(Config) ->
 pid_wrap(Config) when is_list(Config) -> pp_wrap(pid).
 
 port_wrap(Config) when is_list(Config) ->
-    case test_server:os_type() of
+    case os:type() of
         {unix, _} ->
             pp_wrap(port);
         _ ->
@@ -842,11 +840,10 @@ iter_max_procs(Config) when is_list(Config) ->
     Res = chk_max_proc_line(),
     Res = chk_max_proc_line(),
     done = chk_max_proc_line_until(NoMoreTests, Res),
-    {comment,
-     io_lib:format("max processes = ~p; "
-                   "process line length = ~p",
-                   [element(2, Res), element(1, Res)])}.
-
+    Cmt = io_lib:format("max processes = ~p; "
+                        "process line length = ~p",
+                        [element(2, Res), element(1, Res)]),
+    {comment, lists:flatten(Cmt)}.
 
 max_proc_line(Root, Parent, N) ->
     Me = self(),
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index 562cf1c92d..cb683b9cbf 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -30,7 +30,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap, {minutes, 3}}].
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [bsl_bsr, logical, t_not, relop_simple, relop,
@@ -39,9 +39,16 @@ all() ->
 %% Test the bsl and bsr operators.
 bsl_bsr(Config) when is_list(Config) ->
     Vs = [unvalue(V) || V <- [-16#8000009-2,-1,0,1,2,73,16#8000000,bad,[]]],
-    Cases = [{Op,X,Y} || Op <- ['bsr','bsl'], X <- Vs, Y <- Vs],
-    run_test_module(Cases, false),
-    {comment,integer_to_list(length(Cases)) ++ " cases"}.
+    %% Try to use less memory by splitting the cases
+
+    Cases1 = [{Op,X,Y} || Op <- ['bsl'], X <- Vs, Y <- Vs],
+    N1 = length(Cases1),
+    run_test_module(Cases1, false),
+
+    Cases2 = [{Op,X,Y} || Op <- ['bsr'], X <- Vs, Y <- Vs],
+    N2 = length(Cases2),
+    run_test_module(Cases2, false),
+    {comment,integer_to_list(N1 + N2) ++ " cases"}.
 
 %% Test the logical operators and internal BIFs.
 logical(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 328641f5b9..cfbc664b56 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -908,7 +908,7 @@ try_bad_env(Env) ->
 
 %% Test that we can handle a very very large environment gracefully.
 huge_env(Config) when is_list(Config) ->
-    ct:timetrap({seconds, 30}),
+    ct:timetrap({minutes, 2}),
     Vars = case os:type() of
                {win32,_} -> 500;
                _ ->
@@ -1757,7 +1757,7 @@ otp_6224_loop() ->
 
 exit_status_multi_scheduling_block(Config) when is_list(Config) ->
     Repeat = 3,
-    case test_server:os_type() of
+    case os:type() of
         {unix, _} ->
             ct:timetrap({minutes, 2*Repeat}),
             SleepSecs = 6,
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 5bb216ff79..789fa7cf06 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -1003,7 +1003,7 @@ low_prio_test(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     S = spawn_link(?MODULE, prio_server, [0, 0]),
     PCs = spawn_prio_clients(S, erlang:system_info(schedulers_online)),
-    timer:sleep(2000),
+    ct:sleep({seconds,3}),
     lists:foreach(fun (P) -> exit(P, kill) end, PCs),
     S ! exit,
     receive {'EXIT', S, {A, B}} -> check_prio(A, B) end,
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 64c280b198..0b4b302908 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -876,7 +876,7 @@ get_affinity_mask(_Port, _Status, Affinity) ->
     Affinity.
 
 get_affinity_mask() ->
-    case test_server:os_type() of
+    case os:type() of
 	{unix, linux} ->
 	    case catch open_port({spawn, "taskset -p " ++ os:getpid()},
 				 [exit_status]) of
@@ -1733,7 +1733,7 @@ sched_state([], N, DC, DI) ->
 	{N, DC, DI}
     catch
 	_ : _ ->
-	    ?t:fail({inconsisten_scheduler_state, {N, DC, DI}})
+	    ct:fail({inconsisten_scheduler_state, {N, DC, DI}})
     end;
 sched_state([{normal, _, _, _} = S | Rest], _S, DC, DI) ->
     sched_state(Rest, S, DC, DI);