diff options
| author | Hans Bolinder <[email protected]> | 2019-03-22 08:09:38 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-03-22 08:09:38 +0100 |
| commit | 929b22622da2b64f19a2ec708780004e0ef1524a (patch) | |
| tree | 11f072bec72ea8b39cbb866248de9a39ffbdb0a6 /lib | |
| parent | 9bc7321f7ad3446a63a4ea3115fabc6a58a624d4 (diff) | |
| parent | 15115789be87db5108a9701cb5f659eed0f77481 (diff) | |
| download | otp-929b22622da2b64f19a2ec708780004e0ef1524a.tar.gz otp-929b22622da2b64f19a2ec708780004e0ef1524a.tar.bz2 otp-929b22622da2b64f19a2ec708780004e0ef1524a.zip | |
Merge branch 'hasse/stdlib/restore_string_SUITE_timeout'
* hasse/stdlib/restore_string_SUITE_timeout:
stdlib: Restore timeout in string_SUITE:meas()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/test/string_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl index 6afe9e7a76..248912c3f2 100644 --- a/lib/stdlib/test/string_SUITE.erl +++ b/lib/stdlib/test/string_SUITE.erl @@ -52,7 +52,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{minutes,2}}]. + {timetrap,{minutes,1}}]. all() -> [{group, chardata}, {group, list_string}]. @@ -737,10 +737,10 @@ meas(Config) -> case ct:get_timetrap_info() of {_,{_,Scale}} when Scale > 1 -> {skip,{will_not_run_in_debug,Scale}}; - _ -> % No scaling, run at most 2 mins + _ -> % No scaling, run at most 1.5 min Tester = spawn(Exec), receive {test_done, Tester} -> ok - after 120000 -> + after 90000 -> io:format("Timelimit reached stopping~n",[]), exit(Tester, die) end, |