aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred T-H <[email protected]>2009-12-24 14:00:04 -0500
committerBjörn Gustavsson <[email protected]>2010-01-17 16:46:58 +0100
commitf22949680eb728659476b268f487d2a50019357b (patch)
tree1497c8e0858c82f31b4437ec83086675e6e1a430
parent4bcf607bf9ce573790cd1a98c612fd894f938d2b (diff)
downloadotp-f22949680eb728659476b268f487d2a50019357b.tar.gz
otp-f22949680eb728659476b268f487d2a50019357b.tar.bz2
otp-f22949680eb728659476b268f487d2a50019357b.zip
make it possible to include ct.hrl using include_lib
It is major annoyance that ct.hrl cannot be included using "-include_lib". The problem is that ct.hrl in turn includes the test_server include files using "-include". Fix it by using "-include_lib" in ct.hrl.
-rw-r--r--lib/common_test/doc/src/example_chapter.xml6
-rw-r--r--lib/common_test/include/ct.hrl2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/doc/src/example_chapter.xml b/lib/common_test/doc/src/example_chapter.xml
index 028cbf7c8d..8d73b8ce27 100644
--- a/lib/common_test/doc/src/example_chapter.xml
+++ b/lib/common_test/doc/src/example_chapter.xml
@@ -38,7 +38,7 @@
<code>
-module(db_data_type_SUITE).
--include("ct.hrl").
+-include_lib("common_test/include/ct.hrl").
%% Test server callbacks
-export([suite/0, all/0,
@@ -186,7 +186,7 @@ insert_and_lookup(Key, Value, Config) ->
%% Note: This directive should only be used in test suites.
-compile(export_all).
--include("ct.hrl").
+-include_lib("common_test/include/ct.hrl").
%%--------------------------------------------------------------------
%% COMMON TEST CALLBACK FUNCTIONS
@@ -394,7 +394,7 @@ my_test_case(_Config) ->
-compile(export_all).
--include("ct.hrl").
+-include_lib("common_test/include/ct.hrl").
%%--------------------------------------------------------------------
%% Function: suite() -> Info
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index ad3b3374c4..663d08e0a7 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -17,6 +17,6 @@
%% %CopyrightEnd%
%%
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
-compile({parse_transform,ct_line}).