aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2011-12-06 17:52:38 +0100
committerRickard Green <rickard@erlang.org>2011-12-06 17:52:38 +0100
commit3e9a9af2f8b2e68fa6ee0bd0876b144d054d298f (patch)
tree5c4a49e08403290a96e21735ed0065f655c8a112 /erts
parent3996fd94136ceb850fd93c732daeab919ffdcb88 (diff)
parent99a225e257cc166ea1d1b2cc49c14e97e7c50e5d (diff)
downloadotp-3e9a9af2f8b2e68fa6ee0bd0876b144d054d298f.tar.gz
otp-3e9a9af2f8b2e68fa6ee0bd0876b144d054d298f.tar.bz2
otp-3e9a9af2f8b2e68fa6ee0bd0876b144d054d298f.zip
Merge branch 'rickard/test-fixes-r15b'
* rickard/test-fixes-r15b: Skip detached test-case on MacOSX Leopard
Diffstat (limited to 'erts')
-rw-r--r--erts/test/ethread_SUITE.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 4206bebfe7..80f988b0aa 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -174,7 +174,15 @@ detached_thread(doc) ->
detached_thread(suite) ->
[];
detached_thread(Config) ->
- run_case(Config, "detached_thread", "").
+ case {os:type(), os:version()} of
+ {{unix,darwin}, {9, _, _}} ->
+ %% For some reason pthread_create() crashes when more
+ %% threads cannot be created, instead of returning an
+ %% error code on our MacOS X Leopard machine...
+ {skipped, "MacOS X Leopard cannot cope with this test..."};
+ _ ->
+ run_case(Config, "detached_thread", "")
+ end.
max_threads(doc) ->
["Tests maximum number of threads."];