OpenJDK / jigsaw / jake / hotspot
changeset 7858:7d0a5a0bc1da
Merge
| author | vlivanov |
|---|---|
| date | Mon, 19 Jan 2015 14:14:05 +0000 |
| parents | 68fd38ede971 782cedc93dd1 |
| children | b0ce179e4a01 |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/test/compiler/codecache/jmx/PoolsIndependenceTest.java Mon Jan 19 11:35:45 2015 +0000 +++ b/test/compiler/codecache/jmx/PoolsIndependenceTest.java Mon Jan 19 14:14:05 2015 +0000 @@ -98,11 +98,13 @@ return false; }); for (BlobType bt : BlobType.getAvailable()) { - int expectedNotificationsAmount = bt.equals(btype) ? 1 : 0; - Asserts.assertEQ(counters.get(bt.getMemoryPool().getName()).get(), - expectedNotificationsAmount, String.format("Unexpected " - + "amount of notifications for pool: %s", - bt.getMemoryPool().getName())); + if (CodeCacheUtils.isCodeHeapPredictable(bt)) { + int expectedNotificationsAmount = bt.equals(btype) ? 1 : 0; + Asserts.assertEQ(counters.get(bt.getMemoryPool().getName()).get(), + expectedNotificationsAmount, String.format("Unexpected " + + "amount of notifications for pool: %s", + bt.getMemoryPool().getName())); + } } try { ((NotificationEmitter) ManagementFactory.getMemoryMXBean()).
--- a/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Mon Jan 19 11:35:45 2015 +0000 +++ b/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Mon Jan 19 14:14:05 2015 +0000 @@ -52,7 +52,9 @@ public static void main(String[] args) { for (BlobType bt : BlobType.getAvailable()) { - new ThresholdNotificationsTest(bt).runTest(); + if (CodeCacheUtils.isCodeHeapPredictable(bt)) { + new ThresholdNotificationsTest(bt).runTest(); + } } }
--- a/test/compiler/loopopts/7052494/Test7052494.java Mon Jan 19 11:35:45 2015 +0000 +++ b/test/compiler/loopopts/7052494/Test7052494.java Mon Jan 19 14:14:05 2015 +0000 @@ -25,7 +25,6 @@ /** * @test * @bug 7052494 - * @ignore 7154567 * @summary Eclipse test fails on JDK 7 b142 * * @run main/othervm -Xbatch Test7052494