Merge branch 'bg/asn1-tests' into dev

* bg/asn1-tests:
  asn1 tests: Let ts:run() build the tests
  asn1 tests: No longer tolerate compilation warnings
  asn1 tests: Eliminate use of deprecated concat_binary/1
  asn1 tests: Eliminate warning for an unused variable
  asn1 tests: Modernize guard tests
  asn1 tests: Clean up comments
  asn1 tests: Don't refer to $ERL_TOP in compiler options

OTP-8520 bg/asn1-tests

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl
index 0fade7ebca..74002e16e9 100644
--- a/lib/asn1/test/testTimer.erl
+++ b/lib/asn1/test/testTimer.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-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%
 %%
 %%
@@ -22,7 +22,7 @@
 -compile(export_all).
 %%-export([Function/Arity, ...]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(times, 5000).
 
@@ -146,7 +146,7 @@ go(Config,Enc) ->
     Bytes = case Enc of
 		ber_bin ->
 		    list_to_binary(B);
-		per_bin when list(B) ->
+		per_bin when is_list(B) ->
 		    list_to_binary(B);
 		per_bin ->
 		    B;
@@ -179,7 +179,7 @@ encode(0, _Module,_Type,_Value) ->
 encode(N, Module,Type,Value) ->
     ?line {ok,B} = asn1rt:encode(Module,Type,Value),
     _B2 = if 
-             list(B) -> list_to_binary(B);
+             is_list(B) -> list_to_binary(B);
              true -> B
          end,
     encode(N-1, Module,Type,Value).