diff options
| author | Lukas Larsson <[email protected]> | 2014-05-05 14:40:55 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-05-05 14:40:55 +0200 |
| commit | a3ae9cf1e4fd1dee0f47ca9de94f760b29a3de5e (patch) | |
| tree | 5df53347c5ac8a16da98b4b2e8a34cbc0549b6a9 | |
| parent | 210b45c37d3a6999c2d6c7bf9567986280b41fb1 (diff) | |
| parent | abdd3f82100c515508e2c431f8f34dbbc9400d29 (diff) | |
| download | otp-a3ae9cf1e4fd1dee0f47ca9de94f760b29a3de5e.tar.gz otp-a3ae9cf1e4fd1dee0f47ca9de94f760b29a3de5e.tar.bz2 otp-a3ae9cf1e4fd1dee0f47ca9de94f760b29a3de5e.zip | |
Merge branch 'maint'
* maint:
kernel: Skip sendfile tests that force async threads
| -rw-r--r-- | lib/kernel/test/sendfile_SUITE.erl | 7 |
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]. |