Merge branch 'bg/cleanup-tests' into ccase/r13b04_dev

* bg/cleanup-tests:
  file_SUITE: eliminate a warning for an unused variable
  kernel tests: modernize guard tests
  unicode_SUITE: replace deprecated concat_binary/1 with list_to_binary/1
  stdlib tests: modernize guard tests
  Test suites: fix creation of Emakefiles

1 files changed, 14 insertions, 13 deletions

diff --git a/lib/kernel/test/loose_node.erl b/lib/kernel/test/loose_node.erl
index ac1ddb8d9a..87a4ef01c0 100644
--- a/lib/kernel/test/loose_node.erl
+++ b/lib/kernel/test/loose_node.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -55,7 +55,7 @@
 %% Exported functions.
 %%
 
-stop(Node) when atom(Node) ->
+stop(Node) when is_atom(Node) ->
     rpc:cast(Node, erlang, halt, []),
     io:format("Stopped loose node ~p~n", [Node]),
     ok.
@@ -63,9 +63,10 @@ stop(Node) when atom(Node) ->
 start(Name, Args) ->
     start(Name, Args, -1).
 
-start(Name, Args, TimeOut) when atom(Name) ->
+start(Name, Args, TimeOut) when is_atom(Name) ->
     start(atom_to_list(Name), Args, TimeOut);
-start(Name, Args, TimeOut) when list(Name), list(Args), integer(TimeOut) ->
+start(Name, Args, TimeOut)
+  when is_list(Name), is_list(Args), is_integer(TimeOut) ->
     Parent = self(),
     Ref = make_ref(),
     Starter
@@ -119,7 +120,7 @@ start(Name, Args, TimeOut) when list(Name), list(Args), integer(TimeOut) ->
 		  io:format("Trying to start loose node...~n"
 			    "  --> ~p~n", [Cmd]),
 		  Res = case open_port({spawn, Cmd}, []) of
-			    P when port(P) ->
+			    P when is_port(P) ->
 				receive
 				    {loose_node_started,
 				     Node,
@@ -150,14 +151,14 @@ start(Name, Args, TimeOut) when list(Name), list(Args), integer(TimeOut) ->
 %% Exported functions for internal use.
 %%
 
-loose_node_started([Name, Node, TimeOutSecs]) when list(Name),
-						   list(Node),
-						   list(TimeOutSecs) ->
+loose_node_started([Name, Node, TimeOutSecs]) when is_list(Name),
+						   is_list(Node),
+						   is_list(TimeOutSecs) ->
     spawn_opt(fun () ->
 		      process_flag(trap_exit, true),
 		      Proc = {list_to_atom(Name), list_to_atom(Node)},
 		      Timeout = case catch list_to_integer(TimeOutSecs) of
-				    I when integer(I), I >= 0 -> I*1000;
+				    I when is_integer(I), I >= 0 -> I*1000;
 				    _ -> infinity
 				end,
 		      wait_until(fun () -> is_alive() end),