aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-11-17 16:58:48 +0100
committerLukas Larsson <[email protected]>2010-12-08 18:07:48 +0100
commit5bf3141144c48a0f560dd2cc9f95981ec0154e11 (patch)
tree3b706ac5d2337dbc5469614f9c06f849ed374bd9 /lib/test_server/src/test_server.erl
parent1ab0779cd90f5b76bf546b5964e8550f1b68f962 (diff)
downloadotp-5bf3141144c48a0f560dd2cc9f95981ec0154e11.tar.gz
otp-5bf3141144c48a0f560dd2cc9f95981ec0154e11.tar.bz2
otp-5bf3141144c48a0f560dd2cc9f95981ec0154e11.zip
Update end_tc fw call to get {skip,Reason} instead of 'skipped' as return value
Diffstat (limited to 'lib/test_server/src/test_server.erl')
-rw-r--r--lib/test_server/src/test_server.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 3d27788b64..daee278368 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1095,12 +1095,13 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
Skip = {skip,Reason} ->
Line = get_loc(),
Conf = [{tc_status,{skipped,Reason}}],
- NewRes = do_end_tc_call(Mod,Func,{Skip,[Conf]}, skipped),
+ NewRes = do_end_tc_call(Mod,Func,{Skip,[Conf]}, Skip),
{{0,NewRes},Line,[]};
{skip_and_save,Reason,SaveCfg} ->
Line = get_loc(),
Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}],
- NewRes = do_end_tc_call(Mod, Func, {{skip, Reason}, [Conf]}, skipped_and_saved),
+ NewRes = do_end_tc_call(Mod, Func, {{skip, Reason}, [Conf]},
+ {skip, Reason}),
{{0,NewRes},Line,[]};
{ok,NewConf} ->
put(test_server_init_or_end_conf,undefined),