aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-01-17 16:05:43 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-01-17 16:05:43 +0100
commit6927f85ed386ea3c0f43bd042ea4c917103d76a2 (patch)
tree32e0974dcec0c7ac1589da40ecf800d03451afa5 /lib/stdlib
parent9b6643e4c573e4a5536a48f8115f12d0b99f9d41 (diff)
parente1b844db68a770d7d519ff62de827ffba90213b1 (diff)
downloadotp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.gz
otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.tar.bz2
otp-6927f85ed386ea3c0f43bd042ea4c917103d76a2.zip
Merge branch 'egil/cuddle-tests' into maint
* egil/cuddle-tests: stdlib: Increase timetrap for rand_SUITE common_test: Increase timetrap for cth_hooks_SUITE compiler: Increase timetrap timeouts for lc_SUITE
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/rand_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/rand_SUITE.erl b/lib/stdlib/test/rand_SUITE.erl
index 02b7cb10c2..47e7c4f03d 100644
--- a/lib/stdlib/test/rand_SUITE.erl
+++ b/lib/stdlib/test/rand_SUITE.erl
@@ -275,13 +275,13 @@ gen(_, _, Acc) -> lists:reverse(Acc).
%% Check that the algorithms generate sound values.
basic_stats_uniform_1(Config) when is_list(Config) ->
- ct:timetrap({minutes,6}), %% valgrind needs a lot of time
+ ct:timetrap({minutes,15}), %% valgrind needs a lot of time
[basic_uniform_1(?LOOP, rand:seed_s(Alg), 0.0, array:new([{default, 0}]))
|| Alg <- algs()],
ok.
basic_stats_uniform_2(Config) when is_list(Config) ->
- ct:timetrap({minutes,6}), %% valgrind needs a lot of time
+ ct:timetrap({minutes,15}), %% valgrind needs a lot of time
[basic_uniform_2(?LOOP, rand:seed_s(Alg), 0, array:new([{default, 0}]))
|| Alg <- algs()],
ok.
@@ -388,7 +388,7 @@ crypto_uniform_n(N, State0) ->
%% Not a test but measures the time characteristics of the different algorithms
measure(Suite) when is_atom(Suite) -> [];
measure(_Config) ->
- ct:timetrap({minutes,6}), %% valgrind needs a lot of time
+ ct:timetrap({minutes,15}), %% valgrind needs a lot of time
Algos = [crypto64|algs()],
io:format("RNG uniform integer performance~n",[]),
_ = measure_1(random, fun(State) -> {int, random:uniform_s(10000, State)} end),