aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test/public_key_SUITE.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-01-21 15:24:01 +0000
committerErlang/OTP <[email protected]>2010-01-21 15:24:01 +0000
commit246811f7d8fc9d8cadb4f746f719d1a65ee738fc (patch)
tree616c6b4e3333c5cb2c5e8e71e40589f8cdb7477d /lib/public_key/test/public_key_SUITE.erl
parent1ebe327e85ed33276e56ca3e8787243e307a88df (diff)
parent2c6d9b57ce4557a431bcf02565c3634a0ed7ca61 (diff)
downloadotp-246811f7d8fc9d8cadb4f746f719d1a65ee738fc.tar.gz
otp-246811f7d8fc9d8cadb4f746f719d1a65ee738fc.tar.bz2
otp-246811f7d8fc9d8cadb4f746f719d1a65ee738fc.zip
Merge branch 'bg/public_key-include_lib' into ccase/r13b04_dev
* bg/public_key-include_lib: public_key: fix build of test suites on Windows
Diffstat (limited to 'lib/public_key/test/public_key_SUITE.erl')
-rw-r--r--lib/public_key/test/public_key_SUITE.erl15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 93ae6e6eda..8cc36e490d 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.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%
%%
@@ -23,8 +23,9 @@
%% Note: This directive should only be used in test suites.
-compile(export_all).
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
+
-include("public_key.hrl").
-define(TIMEOUT, 120000). % 2 min