aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-09-18 13:51:34 +0200
committerSiri Hansen <[email protected]>2018-09-18 13:51:34 +0200
commit59b49c6a5bc8053db97a27029ecf5245784b45fc (patch)
treea903a63bae7dd60c5e8ec39c7c880e795c7e4d00 /lib/stdlib
parent41e4dcf4993756390e340e25e2724c11bdab337e (diff)
parentb1216cf39c987a65f5545f8d9034a1c37f1654cf (diff)
downloadotp-59b49c6a5bc8053db97a27029ecf5245784b45fc.tar.gz
otp-59b49c6a5bc8053db97a27029ecf5245784b45fc.tar.bz2
otp-59b49c6a5bc8053db97a27029ecf5245784b45fc.zip
Merge branch 'siri/cuddle' into maint
* siri/cuddle: [logger] Skip app level test if app cannot be loaded Terminate nodes after failed test cases in erl_distribution_SUITE Skip performance test on build types other than 'opt'
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/supervisor_SUITE.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index ed7dd04171..9370067910 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -2339,6 +2339,13 @@ order_of_children(_Config) ->
%% Test that a non-simple supervisor scales well for starting and
%% stopping many children.
scale_start_stop_many_children(_Config) ->
+ case erlang:system_info(build_type) of
+ opt -> scale_start_stop_many_children();
+ Other -> {skip,"Run on build type 'opt' only (current: '" ++
+ atom_to_list(Other)++"')"}
+ end.
+
+scale_start_stop_many_children() ->
process_flag(trap_exit, true),
{ok, _Pid} = start_link({ok, {{one_for_one, 2, 3600}, []}}),
N1 = 1000,