Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'lukas/system/skip_fenris_max_threads' into maint

* lukas/system/skip_fenris_max_threads:
  Skip on buggy solaris
  • Loading branch information...
commit 1d1d4456e8bc1089ab632b189c6cc866a4ff59a3 2 parents 5d20526 + 6cbcbdb
@psyeugenic psyeugenic authored
Showing with 10 additions and 3 deletions.
  1. +10 −3 erts/test/ethread_SUITE.erl
View
13 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.
end_per_testcase(_Case, Config) ->
Dog = ?config(watchdog, Config),
Please sign in to comment.
Something went wrong with that request. Please try again.