Merge branch 'maint'

* maint:
  Fix a few dialyzer warnings

4 files changed, 55 insertions, 27 deletions

diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index a0d0c8b6c2..39b2c2a8cd 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -909,7 +909,7 @@ run_test(StartOpt) when is_tuple(StartOpt) ->
     run_test([StartOpt]);
 
 run_test(StartOpts) when is_list(StartOpts) ->
-    CTPid = spawn(fun() -> run_test1(StartOpts) end),
+    CTPid = spawn(run_test1_fun(StartOpts)),
     Ref = monitor(process, CTPid),
     receive
 	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
@@ -918,6 +918,11 @@ run_test(StartOpts) when is_list(StartOpts) ->
 		    Other
     end.
 
+-spec run_test1_fun(_) -> fun(() -> no_return()).
+
+run_test1_fun(StartOpts) ->
+    fun() -> run_test1(StartOpts) end.
+
 run_test1(StartOpts) when is_list(StartOpts) ->
     case proplists:get_value(refresh_logs, StartOpts) of
 	undefined ->
@@ -1369,7 +1374,7 @@ run_dir(Opts = #opts{logdir = LogDir,
 %%% @equiv ct:run_testspec/1
 %%%-----------------------------------------------------------------
 run_testspec(TestSpec) ->
-    CTPid = spawn(fun() -> run_testspec1(TestSpec) end),
+    CTPid = spawn(run_testspec1_fun(TestSpec)),
     Ref = monitor(process, CTPid),
     receive
 	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
@@ -1378,6 +1383,11 @@ run_testspec(TestSpec) ->
 		    Other
     end.
 
+-spec run_testspec1_fun(_) -> fun(() -> no_return()).
+
+run_testspec1_fun(TestSpec) ->
+    fun() -> run_testspec1(TestSpec) end.
+
 run_testspec1(TestSpec) ->
     {ok,Cwd} = file:get_cwd(),
     io:format("~nCommon Test starting (cwd is ~ts)~n~n", [Cwd]),
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 0cd83b9f04..3ad3937548 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -315,7 +315,7 @@ enodename(Host, Node) ->
 do_start(Host, Node, Options) ->
     ENode = enodename(Host, Node),
     Functions =
-	lists:concat([[{ct_slave, slave_started, [ENode, self()]}],
+	lists:append([[{ct_slave, slave_started, [ENode, self()]}],
 		      Options#options.startup_functions,
 		      [{ct_slave, slave_ready, [ENode, self()]}]]),
     Functions2 = if
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index da6bf491ac..73803030a3 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -411,11 +411,9 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     Ref = make_ref(),
     Pid =
 	spawn_link(
-	  fun() ->
-		  run_test_case_eval(Mod, Func, Args, Name, Ref,
-				     RunInit, TimetrapData,
-				     LogOpts, TCCallback)
-	  end),
+          run_test_case_eval_fun(Mod, Func, Args, Name, Ref,
+                                 RunInit, TimetrapData,
+                                 LogOpts, TCCallback)),
     put(test_server_detected_fail, []),
     St = #st{ref=Ref,pid=Pid,mf={Mod,Func},last_known_loc=unknown,
 	     status=starting,ret_val=[],comment="",timeout=infinity,
@@ -907,6 +905,16 @@ job_proxy_msgloop() ->
     end,
     job_proxy_msgloop().
 
+-spec run_test_case_eval_fun(_, _, _, _, _, _, _, _, _) ->
+                                    fun(() -> no_return()).
+run_test_case_eval_fun(Mod, Func, Args, Name, Ref, RunInit,
+                       TimetrapData, LogOpts, TCCallback) ->
+    fun () ->
+            run_test_case_eval(Mod, Func, Args, Name, Ref,
+                               RunInit, TimetrapData,
+                               LogOpts, TCCallback)
+    end.
+
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 
@@ -2408,15 +2416,7 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 	   end,
     Master = self(),
     Ref = make_ref(),
-    Slave = spawn(Node,
-		  fun () ->
-			  start_job_proxy(),
-			  receive
-			      Ref ->
-				  Master ! {Ref, Fun()}
-			  end,
-			  receive after infinity -> infinity end
-		  end),
+    Slave = spawn(Node, start_job_proxy_fun(Master, Fun)),
     MRef = erlang:monitor(process, Slave),
     Slave ! Ref,
     receive
@@ -2431,6 +2431,17 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 	    end
     end.
 
+-spec start_job_proxy_fun(_, _) -> fun(() -> no_return()).
+start_job_proxy_fun(Master, Fun) ->
+    fun () ->
+            start_job_proxy(),
+            receive
+                Ref ->
+                    Master ! {Ref, Fun()}
+            end,
+            receive after infinity -> infinity end
+    end.
+
 %% Return true if Name or node() is a shielded node
 is_shielded(Name) ->
     case {cast_to_list(Name),atom_to_list(node())} of
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index db8d3cde01..c12832e0d0 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -354,15 +354,18 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 	    I = "=== Not waiting for node",
 	    gen_server:reply(From,{{ok, Nodename}, HostStr, Cmd, I, []}),
 	    Self = self(),
-	    spawn_link(
-	      fun() -> 
-		      wait_for_node_started(LSock,Tmo,undefined,
-					    Cleanup,TI,Self),
-		      receive after infinity -> ok end
-	      end),
+	    spawn_link(wait_for_node_started_fun(LSock,Tmo,Cleanup,TI,Self)),
 	    ok
     end.
 
+-spec wait_for_node_started_fun(_, _, _, _, _) -> fun(() -> no_return()).
+wait_for_node_started_fun(LSock, Tmo, Cleanup, TI, Self) ->
+    fun() ->
+            wait_for_node_started(LSock,Tmo,undefined,
+                                  Cleanup,TI,Self),
+            receive after infinity -> ok end
+    end.
+
 %%
 %% Slave nodes are started on a remote host if
 %% - the option remote is given when calling test_server:start_node/3
@@ -468,7 +471,11 @@ handle_start_node_return(Version,VsnStr,{started, Node, OVersion, OVsnStr}) ->
 node_started([Host,PortAtom]) ->
     %% Must spawn a new process because the boot process should not 
     %% hang forever!!
-    spawn(fun() -> node_started(Host,PortAtom) end).
+    spawn(node_started_fun(Host,PortAtom)).
+
+-spec node_started_fun(_, _) -> fun(() -> no_return()).
+node_started_fun(Host,PortAtom) ->
+    fun() -> node_started(Host,PortAtom) end.
 
 %% This process hangs forever, just waiting for the socket to be
 %% closed and terminating the node