test/compiler/loopopts/UseCountedLoopSafepoints.java

*** 26,43 ****
   * @test
   * @bug 6869327
   * @summary Test that C2 flag UseCountedLoopSafepoints ensures a safepoint is kept in a CountedLoop
   * @library /testlibrary
   * @modules java.base/jdk.internal.misc
-  * @modules java.base
   * @ignore 8146096
!  * @run main UseCountedLoopSafepoints
   */
  
! import java.util.concurrent.atomic.AtomicLong;
! import jdk.test.lib.ProcessTools;
  import jdk.test.lib.OutputAnalyzer;
  
  public class UseCountedLoopSafepoints {
      private static final AtomicLong _num = new AtomicLong(0);
  
      // Uses the fact that an EnableBiasedLocking vmop will be started
--- 26,45 ----
   * @test
   * @bug 6869327
   * @summary Test that C2 flag UseCountedLoopSafepoints ensures a safepoint is kept in a CountedLoop
   * @library /testlibrary
   * @modules java.base/jdk.internal.misc
   * @ignore 8146096
!  * @run driver compiler.loopopts.UseCountedLoopSafepoints
   */
  
! package compiler.loopopts;
! 
  import jdk.test.lib.OutputAnalyzer;
+ import jdk.test.lib.ProcessTools;
+ 
+ import java.util.concurrent.atomic.AtomicLong;
  
  public class UseCountedLoopSafepoints {
      private static final AtomicLong _num = new AtomicLong(0);
  
      // Uses the fact that an EnableBiasedLocking vmop will be started
*** 57,67 ****
                      "-XX:+UseBiasedLocking",
                      "-XX:BiasedLockingStartupDelay=500",
                      "-XX:+SafepointTimeout",
                      "-XX:SafepointTimeoutDelay=2000",
                      "-XX:+UseCountedLoopSafepoints",
!                     "UseCountedLoopSafepoints",
                      "2000000000"
                      );
              OutputAnalyzer output = new OutputAnalyzer(pb.start());
              output.shouldNotContain("Timeout detected");
              output.shouldHaveExitValue(0);
--- 59,69 ----
                      "-XX:+UseBiasedLocking",
                      "-XX:BiasedLockingStartupDelay=500",
                      "-XX:+SafepointTimeout",
                      "-XX:SafepointTimeoutDelay=2000",
                      "-XX:+UseCountedLoopSafepoints",
!                     UseCountedLoopSafepoints.class.getName(),
                      "2000000000"
                      );
              OutputAnalyzer output = new OutputAnalyzer(pb.start());
              output.shouldNotContain("Timeout detected");
              output.shouldHaveExitValue(0);