aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-07-14 16:10:31 +0200
committerPeter Andersson <[email protected]>2011-09-23 12:24:54 +0200
commit8618bb8eab726ab5652b40751bdca928b49eca7f (patch)
treec22a3121c8ef9153ad6e97518f9325b0db708e2b
parent021b0dcb2a3a86ec0e07b0de8dc7cde9be0924ba (diff)
downloadotp-8618bb8eab726ab5652b40751bdca928b49eca7f.tar.gz
otp-8618bb8eab726ab5652b40751bdca928b49eca7f.tar.bz2
otp-8618bb8eab726ab5652b40751bdca928b49eca7f.zip
Fix incorrect module name arg to FW:end_tc/3
OTP-9379
-rw-r--r--lib/common_test/src/ct_run.erl3
-rw-r--r--lib/test_server/src/test_server.erl4
-rw-r--r--lib/test_server/src/test_server_sup.erl2
-rw-r--r--lib/test_server/src/ts_erl_config.erl5
4 files changed, 3 insertions, 11 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 4bb555bb9e..c3b0348b26 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2195,9 +2195,6 @@ get_start_opt(Key, IfExists, IfNotExists, Args) ->
exit({user_error,{bad_argument,Key}})
end.
-try_get_start_opt(Key, IfExists, Args) ->
- try_get_start_opt(Key, IfExists, undefined, Args).
-
try_get_start_opt(Key, IfExists, IfNotExists, Args) ->
case lists:keysearch(Key, 1, Args) of
{value,{Key,Val}} when is_function(IfExists) ->
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 591329b361..d3fa3c8b87 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1218,8 +1218,8 @@ do_end_tc_call(M,F,Res,Return) ->
NewReturn
end;
Other ->
- case test_server_sup:framework_call(
- end_tc, [Other,F,Res], Ref) of
+ case test_server_sup:framework_call(Other, end_tc,
+ [?pl2a(M),F,Res], Ref) of
{fail,FWReason} ->
{failed,FWReason};
_Else ->
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 53dfb45e3a..e846a4c14a 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -26,7 +26,7 @@
cleanup_crash_dumps/0, crash_dump_dir/0, tar_crash_dumps/0,
get_username/0, get_os_family/0,
hostatom/0, hostatom/1, hoststr/0, hoststr/1,
- framework_call/2,framework_call/3,
+ framework_call/2,framework_call/3,framework_call/4,
format_loc/1, package_str/1, package_atom/1,
call_trace/1]).
-include("test_server_internal.hrl").
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 640c8ddc9f..3b41f90d55 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -222,7 +222,6 @@ erl_interface(Vars,OsType) ->
end,
CrossCompile = case OsType of
vxworks -> "true";
- ose -> "true";
_ -> "false"
end,
[{erl_interface_libpath, filename:nativename(LibPath)},
@@ -329,8 +328,6 @@ sock_libraries({win32, _}) ->
sock_libraries({unix, _}) ->
""; % Included in general libraries if needed.
sock_libraries(vxworks) ->
- "";
-sock_libraries(ose) ->
"".
link_library(LibName,{win32, _}) ->
@@ -339,8 +336,6 @@ link_library(LibName,{unix, _}) ->
"lib" ++ LibName ++ ".a";
link_library(LibName,vxworks) ->
"lib" ++ LibName ++ ".a";
-link_library(_LibName,ose) ->
- "";
link_library(_LibName,_Other) ->
exit({link_library, not_supported}).