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/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl
index 3ad58eba03..c8cc82f61e 100644
--- a/lib/stdlib/test/win32reg_SUITE.erl
+++ b/lib/stdlib/test/win32reg_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-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(win32reg_SUITE).
@@ -37,7 +37,7 @@ fini(Config) when is_list(Config) ->
     Config.
 
 long(doc) -> "Test long keys and entries (OTP-3446).";
-long(Config) when list(Config) ->
+long(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(10)),
 
     ?line LongKey = "software\\" ++
@@ -61,7 +61,7 @@ long(Config) when list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-evil_write(Config) when list(Config) ->
+evil_write(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(10)),
 
     ?line Key = "Software\\Ericsson\\Erlang",