diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-03 09:46:18 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-03 09:46:18 +0200 |
| commit | 2c323bd46cecd0592a47e32e4b57f3b6600b828d (patch) | |
| tree | bdd04d7516469645c8ce2faee1acc4a205456cab /lib/os_mon/test | |
| parent | b4774c9d55a1606a1abc726e0f7ce563065284b3 (diff) | |
| parent | 5dc2cc80ee62c8c7da2775b56e9ed5e1f30eb940 (diff) | |
| download | otp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.tar.gz otp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.tar.bz2 otp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.zip | |
Merge branch 'jh/freebsdcpu/OTP-12796'
* jh/freebsdcpu/OTP-12796:
os_mon: Comply with C89 standard
os_mon: Update docs for FreeBSD
os_mon: Implement cpu_sup:util/0,1 for FreeBSD
Diffstat (limited to 'lib/os_mon/test')
| -rw-r--r-- | lib/os_mon/test/cpu_sup_SUITE.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl index 9f58e043db..7da819379c 100644 --- a/lib/os_mon/test/cpu_sup_SUITE.erl +++ b/lib/os_mon/test/cpu_sup_SUITE.erl @@ -64,6 +64,8 @@ all() -> [load_api, util_api, util_values, port, unavailable]; {unix, linux} -> [load_api, util_api, util_values, port, unavailable]; + {unix, freebsd} -> + [load_api, util_api, util_values, port, unavailable]; {unix, _OSname} -> [load_api]; _OS -> [unavailable] end. |