Merge

Mon, 21 Oct 2013 22:36:43 -0400

author
dholmes
date
Mon, 21 Oct 2013 22:36:43 -0400
changeset 5956
2036c97e3af0
parent 5953
384c92148c68
parent 5955
8cd1abf3ecab
child 5976
b3a4d4279fa3
child 6002
395499125cb0
child 6033
292050e5d5ea

Merge

     1.1 --- a/test/TEST.groups	Mon Oct 21 14:38:11 2013 -0700
     1.2 +++ b/test/TEST.groups	Mon Oct 21 22:36:43 2013 -0400
     1.3 @@ -64,6 +64,7 @@
     1.4    gc/TestG1ZeroPGCTJcmdThreadPrint.java \
     1.5    gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java \
     1.6    gc/metaspace/TestMetaspacePerfCounters.java \
     1.7 +  gc/metaspace/TestPerfCountersAndMemoryPools.java \
     1.8    runtime/6819213/TestBootNativeLibraryPath.java \
     1.9    runtime/6925573/SortMethodsTest.java \
    1.10    runtime/7107135/Test7107135.sh \
    1.11 @@ -101,7 +102,9 @@
    1.12  needs_jre = \
    1.13    compiler/6852078/Test6852078.java \
    1.14    compiler/7047069/Test7047069.java \
    1.15 -  runtime/6294277/SourceDebugExtension.java
    1.16 +  runtime/6294277/SourceDebugExtension.java \
    1.17 +  runtime/ClassFile/JsrRewriting.java \
    1.18 +  runtime/ClassFile/OomWhileParsingRepeatedJsr.java
    1.19  
    1.20  # Compact 3 adds further tests to compact2
    1.21  #

mercurial