# HG changeset patch
# User anoll
# Date 1409733887 0
# Node ID c35aec39d08e2abdd81eaefc030d8325dc6d7d20
# Parent  14b8221771dcbfe689e524a90dc0f7002751f181# Parent  d2c5fee6714352a1e57304c1834b3ef62bdb8fcc
Merge

diff -r 14b8221771dc -r c35aec39d08e test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java
--- a/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Wed Sep 03 09:25:44 2014 +0200
+++ b/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Wed Sep 03 08:44:47 2014 +0000
@@ -35,7 +35,7 @@
  * @build TestMethodUnloading
  * @build WorkerClass
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation -XX:-UseCompressedOops -XX:+UseParallelGC -XX:CompileOnly=TestMethodUnloading::doWork TestMethodUnloading
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation -XX:-UseCompressedOops -XX:CompileOnly=TestMethodUnloading::doWork TestMethodUnloading
  */
 public class TestMethodUnloading {
     private static final String workerClassName = "WorkerClass";