diff options
| author | Peter Andersson <[email protected]> | 2010-09-02 16:30:11 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2010-09-02 16:30:11 +0200 |
| commit | 79c570a66ccbcfd460801fd3a10848309227a36f (patch) | |
| tree | 5992f487ae531e79a97c42cad019e619c87bdc32 /lib | |
| parent | 2d3952c49124e68588ff10d78b5d622fe648f5e6 (diff) | |
| download | otp-79c570a66ccbcfd460801fd3a10848309227a36f.tar.gz otp-79c570a66ccbcfd460801fd3a10848309227a36f.tar.bz2 otp-79c570a66ccbcfd460801fd3a10848309227a36f.zip | |
Fix problem with {fail,Result} from end_tc not being recognized
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_server/src/test_server.erl | 9 |
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 |