# HG changeset patch
# User vlivanov
# Date 1421676845 0
# Node ID f44908f0377222ea6a0421c04c06b0464cf9df23
# Parent  a70f5680dbab64b33affbdb537bf3bd86f4b680b# Parent  1cf6b04a87d8a90891e1af4262267650a73bc462
Merge

diff -r a70f5680dbab -r f44908f03772 hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java
--- a/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java	Mon Jan 19 11:35:45 2015 +0000
+++ b/hotspot/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()).
diff -r a70f5680dbab -r f44908f03772 hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java
--- a/hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java	Mon Jan 19 11:35:45 2015 +0000
+++ b/hotspot/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();
+            }
         }
     }
 
diff -r a70f5680dbab -r f44908f03772 hotspot/test/compiler/loopopts/7052494/Test7052494.java
--- a/hotspot/test/compiler/loopopts/7052494/Test7052494.java	Mon Jan 19 11:35:45 2015 +0000
+++ b/hotspot/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