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/unicode_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/unicode_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/unicode_SUITE.erl | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl index 81a591f433..07d63bdf22 100644 --- a/lib/stdlib/test/unicode_SUITE.erl +++ b/lib/stdlib/test/unicode_SUITE.erl @@ -21,10 +21,7 @@ -include_lib("common_test/include/ct.hrl"). --export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2, - init_per_testcase/2, - end_per_testcase/2, +-export([all/0, suite/0,groups/0, utf8_illegal_sequences_bif/1, utf16_illegal_sequences_bif/1, random_lists/1, @@ -38,12 +35,6 @@ ex_binaries_errors_utf32_little/1, ex_binaries_errors_utf32_big/1]). -init_per_testcase(_Case, Config) -> - Config. - -end_per_testcase(_Case, _Config) -> - ok. - suite() -> [{ct_hooks,[ts_install_cth]}, {timetrap,{minutes,20}}]. @@ -63,18 +54,6 @@ groups() -> ex_binaries_errors_utf32_little, ex_binaries_errors_utf32_big]}]. -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - binaries_errors_limit(Config) when is_list(Config) -> setlimit(10), ex_binaries_errors_utf8(Config), @@ -761,6 +740,7 @@ leading_lo_surrogate_bif(HiSurr, LoSurr, End) when LoSurr =< End -> leading_lo_surrogate_bif(_, _, _) -> ok. utf8_illegal_sequences_bif(Config) when is_list(Config) -> + ct:timetrap({minutes,40}), %% valgrind needs a lot setlimit(10), ex_utf8_illegal_sequences_bif(Config), setlimit(default), |