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

diff --git a/lib/asn1/test/test_bad_values.erl b/lib/asn1/test/test_bad_values.erl
index 0190b6ee9a..d379a509ab 100644
--- a/lib/asn1/test/test_bad_values.erl
+++ b/lib/asn1/test/test_bad_values.erl
@@ -1,26 +1,26 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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(test_bad_values).
 
 -export([tests/1]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 tests(Config) ->    
     ?line DataDir = ?config(data_dir,Config),