aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang-solutions.com>2012-03-26 12:19:11 +0200
committerLukas Larsson <lukas@erlang-solutions.com>2012-03-26 12:20:41 +0200
commit6cbcbdbe576303e858d33da6c56994dc879cdd3c (patch)
tree76d76a2366bc52d82fe199296f8ca8d122e9be9b
parent158b7744435e6f8500825b60f9002b5bf0639d6b (diff)
downloadotp-6cbcbdbe576303e858d33da6c56994dc879cdd3c.tar.gz
otp-6cbcbdbe576303e858d33da6c56994dc879cdd3c.tar.bz2
otp-6cbcbdbe576303e858d33da6c56994dc879cdd3c.zip
Skip on buggy solaris
-rw-r--r--erts/test/ethread_SUITE.erl13
1 files changed, 10 insertions, 3 deletions
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 5bb5aed3ed..c8bbf2db25 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -246,9 +246,16 @@ dw_atomic_massage(Config) ->
%%
%%
-init_per_testcase(_Case, Config) ->
- Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
- [{watchdog, Dog}|Config].
+init_per_testcase(Case, Config) ->
+ case inet:gethostname() of
+ {ok,"fenris"} when Case == max_threads ->
+ %% Cannot use os:type+os:version as not all
+ %% solaris10 machines are buggy.
+ {skip, "This machine is buggy"};
+ _Else ->
+ Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
+ [{watchdog, Dog}|Config]
+ end.
fin_per_testcase(_Case, Config) ->
Dog = ?config(watchdog, Config),