From e7433c73df70ff0cb20e64548cd9c74021ac0c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 20 Jan 2010 07:25:48 +0100
Subject: system test: 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 emulator 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().
---
 erts/test/erl_print_SUITE.erl | 2 +-
 erts/test/erlc_SUITE.erl      | 2 +-
 erts/test/erlexec_SUITE.erl   | 2 +-
 erts/test/ethread_SUITE.erl   | 2 +-
 erts/test/ignore_cores.erl    | 2 +-
 erts/test/nt_SUITE.erl        | 3 ++-
 erts/test/otp_SUITE.erl       | 3 ++-
 erts/test/run_erl_SUITE.erl   | 2 +-
 erts/test/z_SUITE.erl         | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index b1458d84d0..270d960ff2 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -36,7 +36,7 @@
 
 -export([erlang_display/1, integer/1, float/1, string/1, character/1, snprintf/1, quote/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
     
 all(doc) -> [];
 all(suite) -> test_cases().
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index 1d944811aa..a8a658e5d8 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -23,7 +23,7 @@
 -export([all/1, compile_erl/1, compile_yecc/1, compile_script/1,
 	 compile_mib/1, good_citizen/1, deep_cwd/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 all(suite) ->
     [compile_erl, compile_yecc, compile_script, compile_mib,
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index fcf1e67e9e..6e6abfb6a1 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -35,7 +35,7 @@
 
 -export([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
     
 
 init_per_testcase(Case, Config) ->
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index a8f4f5e90c..82d761e2fc 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -53,7 +53,7 @@
 	 atomic/1,
 	 gate/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 tests() ->
     [create_join_thread,
diff --git a/erts/test/ignore_cores.erl b/erts/test/ignore_cores.erl
index 7ec2cac706..c4f4936cf1 100644
--- a/erts/test/ignore_cores.erl
+++ b/erts/test/ignore_cores.erl
@@ -27,7 +27,7 @@
 
 -module(ignore_cores).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index 7ff5c908e6..f11fc0c8f2 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 %%% Purpose: Test NT specific utilities
 -module(nt_SUITE).
--include("test_server.hrl").
+
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -export([all/1,init_per_testcase/2,fin_per_testcase/2,nt/1,handle_eventlog/2,
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index c6769743dd..7a2f346b34 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -24,7 +24,8 @@
 	 obsolete_but_not_deprecated/1,call_to_deprecated/1,
          call_to_size_1/1,strong_components/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
 -import(lists, [filter/2,foldl/3,foreach/2]).
 
 all(suite) ->
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl
index afff4120d4..791e0df248 100644
--- a/erts/test/run_erl_SUITE.erl
+++ b/erts/test/run_erl_SUITE.erl
@@ -23,7 +23,7 @@
 	 basic/1,heavy/1,heavier/1,defunct/1]).
 -export([ping_me_back/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_Case, Config) ->
     Dog = ?t:timetrap(?t:minutes(2)),
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 0e37af1ca2..54af371b23 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -39,7 +39,7 @@
 
 -export([search_for_core_files/1, core_files/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
     
 
 init_per_testcase(Case, Config) ->
-- 
cgit v1.2.3