diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-28 15:34:46 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-28 15:34:46 +0200 |
| commit | 1d1d4456e8bc1089ab632b189c6cc866a4ff59a3 (patch) | |
| tree | 9a5f6ac5a221d5caa3d1c9b7f8947f081ac4e052 /erts | |
| parent | 5d2052684da2c36bc6101b3992d2feee42ac7282 (diff) | |
| parent | 6cbcbdbe576303e858d33da6c56994dc879cdd3c (diff) | |
| download | otp-1d1d4456e8bc1089ab632b189c6cc866a4ff59a3.tar.gz otp-1d1d4456e8bc1089ab632b189c6cc866a4ff59a3.tar.bz2 otp-1d1d4456e8bc1089ab632b189c6cc866a4ff59a3.zip | |
Merge branch 'lukas/system/skip_fenris_max_threads' into maint
* lukas/system/skip_fenris_max_threads:
Skip on buggy solaris
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), |