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, 7 insertions, 7 deletions

diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 2b39e31a80..2b7de40797 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2000-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%
 %%
 -module(rpc_SUITE).
@@ -333,7 +333,7 @@ suicide(exit, Reason) ->
 
 suicide(erlang, exit, [Name, Reason]) when is_atom(Name) ->
     case whereis(Name) of
-	Pid when pid(Pid) -> suicide(erlang, exit, [Pid, Reason])
+	Pid when is_pid(Pid) -> suicide(erlang, exit, [Pid, Reason])
     end;
 suicide(Mod, Func, Args) ->
     spawn_link(
@@ -448,7 +448,7 @@ call_benchmark(Config) when is_list(Config) ->
     ?t:timetrap_cancel(Timetrap),
     ok.
 
-do_call_benchmark(Node, M) when integer(M), M > 0 ->
+do_call_benchmark(Node, M) when is_integer(M), M > 0 ->
     do_call_benchmark(Node, erlang:now(), 0, M).
 
 do_call_benchmark(Node, {A,B,C}, M, M) ->