diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-31 10:30:44 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-31 10:30:44 +0200 |
| commit | 1a212675c4217bbedfab1e181a88b2fbe4cfa9c4 (patch) | |
| tree | f1115ad235ead91d8d09ad13cd35a211b7c35cf0 /lib/stdlib/test/io_proto_SUITE.erl | |
| parent | 98f13e3c4cf6282e2114deb71805c54596ffdc8a (diff) | |
| parent | 9e9627dd573a14fe604ecd05185afc0640d3517b (diff) | |
| download | otp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.tar.gz otp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.tar.bz2 otp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.zip | |
Merge branch 'egil/erts/cuddle-tests'
* egil/erts/cuddle-tests:
stdlib: Fix small inconsistencies in ets_SUITE
stdlib: Strengthen or relax test cases
kernel: Don't test negative time values in file info
erts: Fix free_mem calculation in bs_construct tests
Diffstat (limited to 'lib/stdlib/test/io_proto_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/io_proto_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl index 4e39f011f6..1e286a9306 100644 --- a/lib/stdlib/test/io_proto_SUITE.erl +++ b/lib/stdlib/test/io_proto_SUITE.erl @@ -75,7 +75,7 @@ end_per_testcase(_Case, Config) -> suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{minutes,20}}]. + {timetrap,{minutes,5}}]. all() -> [setopts_getopts, unicode_options, unicode_options_gen, @@ -462,6 +462,7 @@ unicode_options(Config) when is_list(Config) -> %% Tests various unicode options on random generated files. unicode_options_gen(Config) when is_list(Config) -> + ct:timetrap({minutes,30}), %% valgrind needs a alot of time random:seed(1240, 900586, 553728), PrivDir = proplists:get_value(priv_dir, Config), AllModes = [utf8,utf16,{utf16,big},{utf16,little}, |