aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2019-03-21 11:35:14 +0100
committerHans Bolinder <[email protected]>2019-03-21 11:37:58 +0100
commit15115789be87db5108a9701cb5f659eed0f77481 (patch)
tree1d31496ea41c418c8ee207dbf1950d2087ca5aaf /lib
parent5f324f5077c45b51c727356c0d32a3847cf510af (diff)
downloadotp-15115789be87db5108a9701cb5f659eed0f77481.tar.gz
otp-15115789be87db5108a9701cb5f659eed0f77481.tar.bz2
otp-15115789be87db5108a9701cb5f659eed0f77481.zip
stdlib: Restore timeout in string_SUITE:meas()
Make sure the test case meas() terminates without failing.
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/string_SUITE.erl6
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,