diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-06 15:27:17 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-06 15:27:17 +0200 |
| commit | 61f6e220b6399ae20f72e877628896872bc522ad (patch) | |
| tree | fd5562387234099c0c51a40ab7a07051c6f09315 /lib/os_mon/test/cpu_sup_SUITE.erl | |
| parent | 30c4078cf1a898dfbca2dc8d00655bd766c0fbb1 (diff) | |
| parent | efbd406f1b8f148569a40a090c38929a7661d2aa (diff) | |
| download | otp-61f6e220b6399ae20f72e877628896872bc522ad.tar.gz otp-61f6e220b6399ae20f72e877628896872bc522ad.tar.bz2 otp-61f6e220b6399ae20f72e877628896872bc522ad.zip | |
Merge branch 'dotsimon/os_mon_cpu_sup_solaris64/OTP-11298' into maint
* dotsimon/os_mon_cpu_sup_solaris64/OTP-11298:
Fix broken cpu_sup:nprocs and others on Solaris 64-bit
Fix some compiler warnings
Remove object files when cleaning
Diffstat (limited to 'lib/os_mon/test/cpu_sup_SUITE.erl')
| -rw-r--r-- | lib/os_mon/test/cpu_sup_SUITE.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl index d04adbb6d3..e0382cb0c7 100644 --- a/lib/os_mon/test/cpu_sup_SUITE.erl +++ b/lib/os_mon/test/cpu_sup_SUITE.erl @@ -88,6 +88,7 @@ load_api(Config) when is_list(Config) -> ?line N = cpu_sup:nprocs(), ?line true = is_integer(N), ?line true = N>0, + ?line true = N<1000000, %% avg1() ?line Load1 = cpu_sup:avg1(), |