Fix so that ct_run converts relative diretories in the code path to absolute

Directories added with run_test -pa or -pz in the pre erl_args part of the command line will be converted from relative to absolute, this to avoid confusion when Common Test switches working directory during the test run.

Also fixed in this commit: Problem with timeouts during init_tc or end_tc (in the Test Server framework).

3 files changed, 114 insertions, 1 deletions

diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
index 271eaa673e..75f00c1de3 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
@@ -22,14 +22,20 @@
 
 -include_lib("common_test/include/ct.hrl").
 
+init_per_testcase(_, Config) ->
+    Config.
+
 end_per_testcase(tc2, _Config) ->
     timer:sleep(2000),
     exit(this_should_not_be_printed);
+end_per_testcase(tc4, _Config) ->
+    timer:sleep(2000),
+    exit(this_should_not_be_printed);
 end_per_testcase(_, _) ->
     ok.
 
 all() ->
-    [tc1, tc2, tc3].
+    [tc1, tc2, tc3, tc4].
 
 %%%-----------------------------------------------------------------
 tc1() ->
@@ -66,3 +72,17 @@ tc3(_) ->
 	   (_, Default) -> Default
 	end),
     {comment,"should succeed since ct_fw cancels timetrap in end_tc"}.
+
+%%%-----------------------------------------------------------------
+tc4() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+tc4(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
new file mode 100644
index 0000000000..d1c18d0bb0
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
@@ -0,0 +1,47 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+-module(cfg_error_13_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+init_per_suite() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+init_per_suite(Config) ->
+    ct:comment("should succeed since ct_fw cancels timetrap in end_tc"),
+    Config.
+
+end_per_suite(_) ->
+    ok.
+
+all() ->
+    [tc1].
+
+%%%-----------------------------------------------------------------
+tc1(_) ->
+    dummy.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
new file mode 100644
index 0000000000..367f5f06d6
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
@@ -0,0 +1,46 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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%
+%%
+-module(cfg_error_14_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+end_per_suite(_Config) ->
+    {comment,"should succeed since ct_fw cancels timetrap in end_tc"}.
+
+all() ->
+    [tc1].
+
+%%%-----------------------------------------------------------------
+tc1(_) ->
+    dummy.