diff options
| author | Peter Andersson <[email protected]> | 2011-09-28 17:43:26 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-09-28 22:53:44 +0200 |
| commit | b7f1a0861daa57db115b358927293d98e1630810 (patch) | |
| tree | f873f49ddeda26ff656bc7e2394028daee118684 /lib/common_test/src | |
| parent | 001f0a4baa95ccc6eb553cad9e4551b4e520dc8b (diff) | |
| download | otp-b7f1a0861daa57db115b358927293d98e1630810.tar.gz otp-b7f1a0861daa57db115b358927293d98e1630810.tar.bz2 otp-b7f1a0861daa57db115b358927293d98e1630810.zip | |
Add missing tests for timetrap handling and fix remaining errors
OTP-9593
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/ct_framework.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index 37ecf4f928..482c5242ce 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -204,12 +204,14 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) -> node=node(), data={Mod,FuncSpec}}), - case configure(MergedInfo1,MergedInfo1,SuiteInfo,{Func,DoInit},Config) of + case catch configure(MergedInfo1,MergedInfo1,SuiteInfo,{Func,DoInit},Config) of {suite0_failed,Reason} -> ct_util:set_testdata({curr_tc,{Mod,{suite0_failed,{require,Reason}}}}), {skip,{require_failed_in_suite0,Reason}}; {error,Reason} -> {auto_skip,{require_failed,Reason}}; + {'EXIT',Reason} -> + {auto_skip,Reason}; {ok, FinalConfig} -> case MergeResult of {error,Reason} -> @@ -1306,6 +1308,10 @@ report(What,Data) -> add_to_stats(auto_skipped); {_,{skipped,{require_failed,_}}} -> add_to_stats(auto_skipped); + {_,{skipped,{timetrap_error,_}}} -> + add_to_stats(auto_skipped); + {_,{skipped,{invalid_time_format,_}}} -> + add_to_stats(auto_skipped); {_,{skipped,_}} -> add_to_stats(user_skipped); {_,{SkipOrFail,_Reason}} -> |