diff options
author | Dan Gudmundsson <[email protected]> | 2017-11-30 10:11:05 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2017-11-30 10:11:05 +0100 |
commit | 4acae2aa077de84a69b52a3a975d2dee7ca756f2 (patch) | |
tree | 656e842f28f2437f34294139cb767f4c5469f970 /lib/stdlib/test/unicode_util_SUITE.erl | |
parent | bd9a6590b8f54ec576453ae79a149f8eb4127a48 (diff) | |
parent | 79f7815238673bbeea2b4551cc207768c348e5ce (diff) | |
download | otp-4acae2aa077de84a69b52a3a975d2dee7ca756f2.tar.gz otp-4acae2aa077de84a69b52a3a975d2dee7ca756f2.tar.bz2 otp-4acae2aa077de84a69b52a3a975d2dee7ca756f2.zip |
Merge branch 'maint'
* maint:
Avoid falling measurements testcases on slow machines
stdlib: string optimize special case for ASCII
stdlib: Minor unicode_util opts
Diffstat (limited to 'lib/stdlib/test/unicode_util_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/unicode_util_SUITE.erl | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/stdlib/test/unicode_util_SUITE.erl b/lib/stdlib/test/unicode_util_SUITE.erl index 7dba0a2fd0..632d9ae6e6 100644 --- a/lib/stdlib/test/unicode_util_SUITE.erl +++ b/lib/stdlib/test/unicode_util_SUITE.erl @@ -312,12 +312,23 @@ get(_) -> add_get_tests. count(Config) -> + Parent = self(), + Exec = fun() -> + do_measure(Config), + Parent ! {test_done, self()} + end, ct:timetrap({minutes,5}), case ct:get_timetrap_info() of - {_,{_,Scale}} -> + {_,{_,Scale}} when Scale > 1 -> {skip,{measurments_skipped_debug,Scale}}; - _ -> % No scaling - do_measure(Config) + _ -> % No scaling, run at most 2 min + Tester = spawn(Exec), + receive {test_done, Tester} -> ok + after 120000 -> + io:format("Timelimit reached stopping~n",[]), + exit(Tester, die) + end, + ok end. do_measure(Config) -> |