aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-03-23 19:46:14 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-04-07 18:40:51 +0200
commit8a6ed0a09eb52f62e7df35d64ac5f3a09aa18edf (patch)
treed7a87121a068d22471a7551cbb25542415e352e0
parent4b748a0bb443a919119158266426372077b0f5b9 (diff)
downloadotp-8a6ed0a09eb52f62e7df35d64ac5f3a09aa18edf.tar.gz
otp-8a6ed0a09eb52f62e7df35d64ac5f3a09aa18edf.tar.bz2
otp-8a6ed0a09eb52f62e7df35d64ac5f3a09aa18edf.zip
Increase timetrap timeout for op_SUITE:bsl_bsr/1
-rw-r--r--erts/emulator/test/op_SUITE.erl15
1 files changed, 11 insertions, 4 deletions
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index 562cf1c92d..cb683b9cbf 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -30,7 +30,7 @@
suite() ->
[{ct_hooks,[ts_install_cth]},
- {timetrap, {minutes, 3}}].
+ {timetrap, {minutes, 5}}].
all() ->
[bsl_bsr, logical, t_not, relop_simple, relop,
@@ -39,9 +39,16 @@ all() ->
%% Test the bsl and bsr operators.
bsl_bsr(Config) when is_list(Config) ->
Vs = [unvalue(V) || V <- [-16#8000009-2,-1,0,1,2,73,16#8000000,bad,[]]],
- Cases = [{Op,X,Y} || Op <- ['bsr','bsl'], X <- Vs, Y <- Vs],
- run_test_module(Cases, false),
- {comment,integer_to_list(length(Cases)) ++ " cases"}.
+ %% Try to use less memory by splitting the cases
+
+ Cases1 = [{Op,X,Y} || Op <- ['bsl'], X <- Vs, Y <- Vs],
+ N1 = length(Cases1),
+ run_test_module(Cases1, false),
+
+ Cases2 = [{Op,X,Y} || Op <- ['bsr'], X <- Vs, Y <- Vs],
+ N2 = length(Cases2),
+ run_test_module(Cases2, false),
+ {comment,integer_to_list(N1 + N2) ++ " cases"}.
%% Test the logical operators and internal BIFs.
logical(Config) when is_list(Config) ->