diff options
| author | Patrik Nyblom <[email protected]> | 2010-05-05 15:13:59 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-05-17 15:51:50 +0200 |
| commit | f197068153bdc0aa749267ea30e77bf0173172f4 (patch) | |
| tree | 8cef64ddacb5b3759f7d31811da24a6f20b66d18 /lib | |
| parent | 0a3305354685b311cfa85b29214b411b24aafcff (diff) | |
| download | otp-f197068153bdc0aa749267ea30e77bf0173172f4.tar.gz otp-f197068153bdc0aa749267ea30e77bf0173172f4.tar.bz2 otp-f197068153bdc0aa749267ea30e77bf0173172f4.zip | |
Add longer timetrap to testcases and add binary to app file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/stdlib.app.src | 1 | ||||
| -rw-r--r-- | lib/stdlib/test/binary_module_SUITE.erl | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src index 3e52c48e42..aeb227ce53 100644 --- a/lib/stdlib/src/stdlib.app.src +++ b/lib/stdlib/src/stdlib.app.src @@ -23,6 +23,7 @@ {modules, [array, base64, beam_lib, + binary, c, calendar, dets, diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl index 4ba3ef4809..31f29eb9e1 100644 --- a/lib/stdlib/test/binary_module_SUITE.erl +++ b/lib/stdlib/test/binary_module_SUITE.erl @@ -17,6 +17,10 @@ -else. -include("test_server.hrl"). +-export([init_per_testcase/2, fin_per_testcase/2]). +% Default timetrap timeout (set in init_per_testcase). +% Some of these testcases are really heavy... +-define(default_timeout, ?t:minutes(10)). -endif. @@ -28,6 +32,16 @@ run() -> [ apply(?MODULE,X,[[]]) || X <- all(suite) ]. +-else. + +init_per_testcase(_Case, Config) -> + ?line Dog = ?t:timetrap(?default_timeout), + [{watchdog, Dog} | Config]. + +fin_per_testcase(_Case, Config) -> + ?line Dog = ?config(watchdog, Config), + ?line test_server:timetrap_cancel(Dog), + ok. -endif. all(suite) -> [interesting,random_ref_fla_comp,random_ref_sr_comp, |