diff options
| author | Lukas Larsson <[email protected]> | 2011-04-05 16:59:12 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-04-15 14:44:53 +0200 |
| commit | 39e1f346082183697de936904231d75ec61553a9 (patch) | |
| tree | 3a40d942ee005547ba7577a6655cc8034ee555ac | |
| parent | fb1eab890f6776419b3999285dff45802658e8f0 (diff) | |
| download | otp-39e1f346082183697de936904231d75ec61553a9.tar.gz otp-39e1f346082183697de936904231d75ec61553a9.tar.bz2 otp-39e1f346082183697de936904231d75ec61553a9.zip | |
Update end_tc framework calls to check the name of the framework module instead of the return value of the call
| -rw-r--r-- | lib/test_server/src/test_server.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index 7f0011bd68..4e6c65a532 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1193,11 +1193,8 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) -> do_end_tc_call(M,F,Res,Return) -> Ref = make_ref(), - case test_server_sup:framework_call( - end_tc, [?pl2a(M),F,Res], Ref) of - {fail,FWReason} -> - {failed,FWReason}; - Ref -> + case ?pl2a(M) of + ct_framework -> case test_server_sup:framework_call( end_tc, [?pl2a(M),F,Res, Return], ok) of {fail,FWReason} -> @@ -1212,8 +1209,14 @@ do_end_tc_call(M,F,Res,Return) -> NewReturn -> NewReturn end; - _ -> - Return + Other -> + case test_server_sup:framework_call( + end_tc, [Other,F,Res], Ref) of + {fail,FWReason} -> + {failed,FWReason}; + _Else -> + Return + end end. %% the return value is a list and we have to check if it contains |