aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_sup.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-06-07 17:28:01 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:25 +0200
commit2dbeff631ce93744972cb04039d434aa172d28f4 (patch)
tree23b1ddfd4a41658cf3e9592f14b132111cfe8a47 /lib/test_server/src/test_server_sup.erl
parent4ed31623e145531a1aa84f6c1091481820f62099 (diff)
downloadotp-2dbeff631ce93744972cb04039d434aa172d28f4.tar.gz
otp-2dbeff631ce93744972cb04039d434aa172d28f4.tar.bz2
otp-2dbeff631ce93744972cb04039d434aa172d28f4.zip
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).
Diffstat (limited to 'lib/test_server/src/test_server_sup.erl')
-rw-r--r--lib/test_server/src/test_server_sup.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 2b4e1efb71..625724fbb5 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -504,6 +504,7 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
end,
case erlang:function_exported(Mod,Func,length(Args)) of
true ->
+ put(test_server_loc, {Mod,Func,framework}),
EH = fun(Reason) -> exit({fw_error,{Mod,Func,Reason}}) end,
try apply(Mod,Func,Args) of
Result ->