diff options
| author | Lukas Larsson <[email protected]> | 2014-08-06 15:07:23 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-08-06 15:07:23 +0200 |
| commit | bf4d615f04002aebca4e340f9fa0aaf3888e84e2 (patch) | |
| tree | 7c402e1810ed576cf305ff3f244a0aa88565d8e1 /lib/os_mon/src/disksup.erl | |
| parent | f3220cea004a277b477b0f53cc35ab8122a53792 (diff) | |
| parent | 85635f0d0e47ca4db56a88681c15f73f1727298a (diff) | |
| download | otp-bf4d615f04002aebca4e340f9fa0aaf3888e84e2.tar.gz otp-bf4d615f04002aebca4e340f9fa0aaf3888e84e2.tar.bz2 otp-bf4d615f04002aebca4e340f9fa0aaf3888e84e2.zip | |
Merge branch 'lukas/os_mon/testfixes/OTP-12053' into maint
* lukas/os_mon/testfixes/OTP-12053:
os_mon: Fix so that all testcases are run
os_mon: Ignore posix_only on windows and solaris
Diffstat (limited to 'lib/os_mon/src/disksup.erl')
| -rw-r--r-- | lib/os_mon/src/disksup.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl index 3fd80f2365..af5bcc6fe8 100644 --- a/lib/os_mon/src/disksup.erl +++ b/lib/os_mon/src/disksup.erl @@ -211,14 +211,14 @@ format_status(_Opt, [_PDict, #state{os = OS, threshold = Threshold, get_os(PosixOnly) -> case os:type() of - {unix, _} when PosixOnly -> - {unix, posix}; {unix, sunos} -> - case os:version() of + case os:version() of {5,_,_} -> {unix, solaris}; {4,_,_} -> {unix, sunos4}; V -> exit({unknown_os_version, V}) - end; + end; + {unix, _} when PosixOnly -> + {unix, posix}; {unix, irix64} -> {unix, irix}; OS -> OS |