*** old/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Mon Feb 22 14:10:04 2016
--- new/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Mon Feb 22 14:10:04 2016

*** 25,42 ****
--- 25,41 ----
   * @test
   * @bug 8137167
   * @summary Tests jcmd to be able to add a lot of huge directive files with
   *          parallel executed jcmds until timeout has reached
   * @library /testlibrary /test/lib /compiler/testlibrary ../share /
   * @ignore 8148563
   * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
   *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
   *        compiler.testlibrary.CompilerUtils
   *        compiler.compilercontrol.share.actions.*
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main/othervm/timeout=360 compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
!  * @run main/othervm -Xmixed -XX:CompilerDirectivesLimit=1601 compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
   */
  
  package compiler.compilercontrol.jcmd;
  
  import jdk.test.lib.dcmd.PidJcmdExecutor;

*** 47,64 ****
--- 46,67 ----
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.ThreadPoolExecutor;
  import java.util.concurrent.TimeUnit;
  
  public class StressAddMultiThreadedTest extends StressAddJcmdBase {
+ 
      private static final int THREADS;
      private final BlockingQueue<Runnable> queue;
      private final ExecutorService executor;
  
      static {
!         THREADS = Runtime.getRuntime().availableProcessors()
                  * Integer.getInteger("compiler.compilercontrol.jcmd" +
!                         ".StressAddMultiThreadedTest.threadFactor", 10);
!         THREADS = Integer.getInteger("compiler.compilercontrol.jcmd" +
+                         ".StressAddMultiThreadedTest.threadFactor",
!                 4);
+         DIRECTIVES_AMOUNT = Integer.getInteger(
+                 "compiler.compilercontrol.jcmd.StressAddJcmdBase.directivesAmount",
+                 100);
      }
  
      public StressAddMultiThreadedTest() {
          queue = new ArrayBlockingQueue<>(THREADS);
          executor = new ThreadPoolExecutor(THREADS, THREADS, 100,