diff options
author | Peter Andersson <[email protected]> | 2012-03-26 13:40:14 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-03-26 13:40:20 +0200 |
commit | 67ccf96bb7b430e691509a45299eeee1ca5f27c5 (patch) | |
tree | 2f0fdf2cf41e2f39d430d17413ff6d1e9b24f819 /lib/common_test/test/ct_test_support.erl | |
parent | 22c4c386fe2a8655b1c9be09a083b89e220f1120 (diff) | |
parent | 5fd16511a1240220f0126f7be51f44aa38bcce56 (diff) | |
download | otp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.tar.gz otp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.tar.bz2 otp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.zip |
Merge remote branch 'origin/peppe/common_test/otp-9988_9871.merged' into maint
* origin/peppe/common_test/otp-9988_9871.merged:
Fix various problems with the user timetrap implementation
Fix dialyzer reported errors
Implement support for user controlled timetraps
OTP-9988
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
-rw-r--r-- | lib/common_test/test/ct_test_support.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 42d4a1630d..62c167d78b 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -1011,6 +1011,12 @@ result_match({SkipOrFail,{ErrorInd,{Why,'_'}}}, result_match({SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,'_'}}}}, {SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,_Stack}}}}) -> true; +result_match({failed,{timetrap_timeout,{'$approx',Num}}}, + {failed,{timetrap_timeout,Value}}) -> + if Value >= trunc(Num-0.01*Num), + Value =< trunc(Num+0.01*Num) -> true; + true -> false + end; result_match(Result, Result) -> true; result_match(_, _) -> |