aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-01-19 18:08:27 +0100
committerBjörn Gustavsson <[email protected]>2010-01-19 18:08:27 +0100
commit2c6d9b57ce4557a431bcf02565c3634a0ed7ca61 (patch)
tree67b8ed941b233a001185127ad1d8756054792ef8 /lib
parent7aeea26018246415dbfa829f134040b3eefa1ee2 (diff)
downloadotp-2c6d9b57ce4557a431bcf02565c3634a0ed7ca61.tar.gz
otp-2c6d9b57ce4557a431bcf02565c3634a0ed7ca61.tar.bz2
otp-2c6d9b57ce4557a431bcf02565c3634a0ed7ca61.zip
public_key: fix build of test suites on Windows
On Windows, the ERL_TOP environment variable contains a path that only is valid for cygwin-enabled programs, such as 'make'. It is not meaningful to pass the value of $ERL_TOP in the -I option to the Erlang compiler, because the Erlang emualator does not interpret cygwin paths correctly. Therefore, -include("test_server.hrl") will fail to find test_server.hrl. Work around the problem by using -include_lib().
Diffstat (limited to 'lib')
-rw-r--r--lib/public_key/test/Makefile2
-rw-r--r--lib/public_key/test/public_key_SUITE.erl5
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/public_key/test/Makefile b/lib/public_key/test/Makefile
index 2a4687677c..62d7ddd16e 100644
--- a/lib/public_key/test/Makefile
+++ b/lib/public_key/test/Makefile
@@ -21,7 +21,7 @@ include $(ERL_TOP)/make/target.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk
-INCLUDES= -I. -I$(ERL_TOP)/lib/test_server/include/ -I ../include \
+INCLUDES= -I. -I ../include
# ----------------------------------------------------
# Target Specs
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 93ae6e6eda..122ab1bd7d 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -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