diff options
| author | Erlang/OTP <[email protected]> | 2010-03-16 06:54:37 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-16 06:54:37 +0000 |
| commit | 7a18238092f56b6c49c1fa798fa5b3858dbce5cc (patch) | |
| tree | bdc73c3a8fd680a016985e5a4984f74510fc1dde /lib/asn1/test/test_modified_x420.erl | |
| parent | 3aa73b1a0345c0ce851081567c220697eeba4233 (diff) | |
| parent | 878f36c7a66e8f7459de660bf2713fb1f75c2dfb (diff) | |
| download | otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.tar.gz otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.tar.bz2 otp-7a18238092f56b6c49c1fa798fa5b3858dbce5cc.zip | |
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
Diffstat (limited to 'lib/asn1/test/test_modified_x420.erl')
| -rw-r--r-- | lib/asn1/test/test_modified_x420.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl index 93fcd73eaf..4e96db070b 100644 --- a/lib/asn1/test/test_modified_x420.erl +++ b/lib/asn1/test/test_modified_x420.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2008-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([compile/1, test_io/1]). --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). compile(Config) -> ?line DataDir = ?config(data_dir,Config), |