aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-05-05 14:40:32 +0200
committerLukas Larsson <[email protected]>2014-05-05 14:40:32 +0200
commitabdd3f82100c515508e2c431f8f34dbbc9400d29 (patch)
tree982af9e2e6d7a77ca49b2223a004c204619ffbc7
parent43fe944a466c47cca84cc4b02371004847927355 (diff)
parent3fa8cba85018d77599a4028dcc300fb08f92d422 (diff)
downloadotp-abdd3f82100c515508e2c431f8f34dbbc9400d29.tar.gz
otp-abdd3f82100c515508e2c431f8f34dbbc9400d29.tar.bz2
otp-abdd3f82100c515508e2c431f8f34dbbc9400d29.zip
Merge branch 'lukas/kernel/fix_sendfile_no_async_tests/OTP-11903' into maint
* lukas/kernel/fix_sendfile_no_async_tests/OTP-11903: kernel: Skip sendfile tests that force async threads
-rw-r--r--lib/kernel/test/sendfile_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index 2c741232c4..123e849ccb 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -72,7 +72,12 @@ end_per_suite(Config) ->
file:delete(proplists:get_value(big_file, Config)).
init_per_group(async_threads,Config) ->
- [{sendfile_opts,[{use_threads,true}]}|Config];
+ case erlang:system_info(thread_pool_size) of
+ 0 ->
+ {skip,"No async threads"};
+ _ ->
+ [{sendfile_opts,[{use_threads,true}]}|Config]
+ end;
init_per_group(no_async_threads,Config) ->
[{sendfile_opts,[{use_threads,false}]}|Config].