diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-28 15:35:19 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-28 15:35:19 +0200 |
| commit | aa4ea2a3dcc0eb53e18f5f39ab5ff61692100837 (patch) | |
| tree | 686dd0ed8226ea4440fcfbb36f75658cc96f3bdb /erts | |
| parent | 3c7d538643f21126a82b6bec27c797d5c042e0f8 (diff) | |
| parent | 1d1d4456e8bc1089ab632b189c6cc866a4ff59a3 (diff) | |
| download | otp-aa4ea2a3dcc0eb53e18f5f39ab5ff61692100837.tar.gz otp-aa4ea2a3dcc0eb53e18f5f39ab5ff61692100837.tar.bz2 otp-aa4ea2a3dcc0eb53e18f5f39ab5ff61692100837.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/ethread_SUITE.erl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl index 84b08d93d5..ad01854f9f 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. end_per_testcase(_Case, Config) -> Dog = ?config(watchdog, Config), |