aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-09-10 14:21:05 +0200
committerLukas Larsson <[email protected]>2010-09-10 14:21:05 +0200
commitbf276aef756681bd2ccb31aff54b646ff6a68d73 (patch)
tree6c162c0cb5ec05f47351d838b0e650b4c9b36286
parent90edf56602b839893d1587df69b1ae0659000001 (diff)
parent79c570a66ccbcfd460801fd3a10848309227a36f (diff)
downloadotp-bf276aef756681bd2ccb31aff54b646ff6a68d73.tar.gz
otp-bf276aef756681bd2ccb31aff54b646ff6a68d73.tar.bz2
otp-bf276aef756681bd2ccb31aff54b646ff6a68d73.zip
Merge branch 'peppe/common_test/dev/OTP-8805' into dev
* peppe/common_test/dev/OTP-8805: Fix problem with {fail,Result} from end_tc not being recognized Fix problem with prepared_tests tuple not being recognized Add verification terms to test suite Fix various test suite, makefile, and doc related problems Fix error in the repeat_until_* group property handling
-rw-r--r--lib/test_server/src/test_server.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index acc9dbaab8..ee121e5bb6 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1198,8 +1198,13 @@ process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
true -> % must be return value from end conf case
process_return_val1(Return, M,F,A, Loc, Final, []);
false -> % must be Config value from init conf case
- test_server_sup:framework_call(end_tc, [?pl2a(M),F,{ok,A}]),
- {Return,[]}
+ case test_server_sup:framework_call(end_tc, [?pl2a(M),F,{ok,A}]) of
+ {fail,FWReason} ->
+ fw_error_notify(M,F,A, FWReason),
+ {{failed,FWReason},[]};
+ _ ->
+ {Return,[]}
+ end
end;
%% the return value is not a list, so it's the return value from an
%% end conf case or it's a dummy value that can be ignored