aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-09-22 18:48:56 +0200
committerPeter Andersson <[email protected]>2011-09-23 12:24:56 +0200
commitc7d6fa638a635a9abc7c2f10071f755032ba3617 (patch)
tree3959cfc46a14461f282f5a625b69f47a766c516c
parent178940b2184bb3cdaa79d9d51b09c54fbfe68300 (diff)
downloadotp-c7d6fa638a635a9abc7c2f10071f755032ba3617.tar.gz
otp-c7d6fa638a635a9abc7c2f10071f755032ba3617.tar.bz2
otp-c7d6fa638a635a9abc7c2f10071f755032ba3617.zip
Fix problem with location value when init config func calls help func
-rw-r--r--lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl2
-rw-r--r--lib/test_server/src/test_server.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
index 47cea190dd..bda7d91161 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
@@ -143,7 +143,7 @@ tc1(_) ->
exit(should_have_been_skipped).
tc2(_) ->
- exit(should_have_been_skipped).
+ timeout_in_end_per_testcase.
tc3(_) ->
timer:sleep(5000).
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 303ee3ae95..e1a139af6f 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1235,7 +1235,7 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
%% call user callback function if defined
Return1 = user_callback(TCCallback, Mod, Func, 'end', Return),
{Return2,Opts} = process_return_val([Return1], Mod, Func,
- Args1, Loc, Return1),
+ Args1, {Mod,Func}, Return1),
{{T,Return2},Loc,Opts}
end.