changeset 12930:8cd1abf3ecab

Merge
author dholmes
date Mon, 21 Oct 2013 21:06:20 -0400
parents f9d4ed6c88dd (diff) c51cd6af7e61 (current diff)
children 2036c97e3af0
files src/share/vm/memory/metablock.cpp src/share/vm/memory/metablock.hpp test/TEST.groups test/compiler/8013496/Test8013496.sh test/gc/7168848/HumongousAlloc.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/TEST.groups	Fri Oct 18 12:10:44 2013 -0700
+++ b/test/TEST.groups	Mon Oct 21 21:06:20 2013 -0400
@@ -64,6 +64,7 @@
   gc/TestG1ZeroPGCTJcmdThreadPrint.java \
   gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java \
   gc/metaspace/TestMetaspacePerfCounters.java \
+  gc/metaspace/TestPerfCountersAndMemoryPools.java \
   runtime/6819213/TestBootNativeLibraryPath.java \
   runtime/6925573/SortMethodsTest.java \
   runtime/7107135/Test7107135.sh \
@@ -101,7 +102,9 @@
 needs_jre = \
   compiler/6852078/Test6852078.java \
   compiler/7047069/Test7047069.java \
-  runtime/6294277/SourceDebugExtension.java
+  runtime/6294277/SourceDebugExtension.java \
+  runtime/ClassFile/JsrRewriting.java \
+  runtime/ClassFile/OomWhileParsingRepeatedJsr.java
 
 # Compact 3 adds further tests to compact2
 #