Merge

Tue, 19 Aug 2014 09:13:06 +0000

author
poonam
date
Tue, 19 Aug 2014 09:13:06 +0000
changeset 7046
15b01edee7c0
parent 7045
18bf0b66de52
parent 7044
8a7429682242
child 7047
2d1534aa7131

Merge

     1.1 --- a/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Tue Aug 19 02:05:49 2014 -0700
     1.2 +++ b/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Tue Aug 19 09:13:06 2014 +0000
     1.3 @@ -45,6 +45,7 @@
     1.4    private static OutputAnalyzer run(boolean enableUnloading) throws Exception {
     1.5      ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
     1.6        "-Xbootclasspath/a:.",
     1.7 +      "-XX:+UnlockDiagnosticVMOptions",
     1.8        "-XX:+WhiteBoxAPI",
     1.9        "-XX:MetaspaceSize=" + MetaspaceSize,
    1.10        "-Xmn" + YoungGenSize,
     2.1 --- a/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Tue Aug 19 02:05:49 2014 -0700
     2.2 +++ b/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Tue Aug 19 09:13:06 2014 +0000
     2.3 @@ -45,6 +45,7 @@
     2.4    private static OutputAnalyzer run(boolean enableUnloading) throws Exception {
     2.5      ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
     2.6        "-Xbootclasspath/a:.",
     2.7 +      "-XX:+UnlockDiagnosticVMOptions",
     2.8        "-XX:+WhiteBoxAPI",
     2.9        "-XX:MetaspaceSize=" + MetaspaceSize,
    2.10        "-Xmn" + YoungGenSize,

mercurial