stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Dmitry Samersoff 2015-08-04 19:25:59 +00:00
commit b8c808e251
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java
View File

@ -73,6 +73,8 @@ public class TestTotalSwap {
private static final long MAX_SIZE_FOR_PASS = Long.MAX_VALUE;
public static void main(String args[]) throws Throwable {
// yocto might ignore the request to report swap size in bytes
boolean swapInKB = mbean.getVersion().contains("yocto");
long expected_swap_size = getSwapSizeFromOs();
@ -87,10 +89,13 @@ public class TestTotalSwap {
if (expected_swap_size > -1) {
if (size != expected_swap_size) {
throw new RuntimeException("Expected total swap size : " +
expected_swap_size +
" but getTotalSwapSpaceSize returned: " +
size);
// try the expected size in kiloBytes
if (!(swapInKB && expected_swap_size * 1024 == size)) {
throw new RuntimeException("Expected total swap size : " +
expected_swap_size +
" but getTotalSwapSpaceSize returned: " +
size);
}
}
}