diff options
| author | Erlang/OTP <[email protected]> | 2010-01-22 07:09:30 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-22 08:17:13 +0100 |
| commit | c7187afaf4d672e0320a73708fe44d5ac5520b52 (patch) | |
| tree | b1d97c44e6efab4cb5f6dbac4768dee8b012d87d /erts/test/run_erl_SUITE.erl | |
| parent | 246811f7d8fc9d8cadb4f746f719d1a65ee738fc (diff) | |
| parent | 862e0ebe4fbc08ade2ebaf08b8ad218ac705d8b6 (diff) | |
| download | otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.tar.gz otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.tar.bz2 otp-c7187afaf4d672e0320a73708fe44d5ac5520b52.zip | |
Merge branch 'bg/avoid-etop-in-include' into ccase/r13b04_dev
* bg/avoid-etop-in-include:
epmd tests: fix build of test suites on Windows
system test: fix build of test suites on Windows
Diffstat (limited to 'erts/test/run_erl_SUITE.erl')
| -rw-r--r-- | erts/test/run_erl_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl index afff4120d4..efeafbad8c 100644 --- a/erts/test/run_erl_SUITE.erl +++ b/erts/test/run_erl_SUITE.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2005-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2005-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,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)), |