diff options
| author | Rickard Green <[email protected]> | 2010-12-01 14:19:13 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-12-01 14:19:13 +0100 |
| commit | b26d90c13902776c1a30bfeedc2131d2c0ac16bc (patch) | |
| tree | fa67788173f10f532e838cd5212a74a9d7110b5c | |
| parent | 07881ee69f6fd9ae9d211b50bae1a22d553525d2 (diff) | |
| parent | 37f928e483bfe7f038b253b3bdb8f236b6e8920d (diff) | |
| download | otp-b26d90c13902776c1a30bfeedc2131d2c0ac16bc.tar.gz otp-b26d90c13902776c1a30bfeedc2131d2c0ac16bc.tar.bz2 otp-b26d90c13902776c1a30bfeedc2131d2c0ac16bc.zip | |
Merge branch 'rickard/leopard-max-threads' into dev
* rickard/leopard-max-threads:
Skip ethread_SUITE:max_threads test on MacOS X Leopard
| -rw-r--r-- | erts/test/ethread_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl index 0cc315e9be..93e27fa8d3 100644 --- a/erts/test/ethread_SUITE.erl +++ b/erts/test/ethread_SUITE.erl @@ -171,7 +171,15 @@ max_threads(doc) -> max_threads(suite) -> []; max_threads(Config) -> - run_case(Config, "max_threads", ""). + 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, "max_threads", "") + end. tsd(doc) -> ["Tests thread specific data."]; |