test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java

*** 35,47 ****
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
   */
  
! import com.oracle.java.testlibrary.*;
! import com.oracle.java.testlibrary.cli.CommandLineOptionTest;
! import com.oracle.java.testlibrary.cli.predicate.AndPredicate;
  import rtm.*;
  import rtm.predicate.SupportedCPU;
  import rtm.predicate.SupportedVM;
  
  /**
--- 35,47 ----
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
   */
  
! import jdk.test.lib.*;
! import jdk.test.lib.cli.CommandLineOptionTest;
! import jdk.test.lib.cli.predicate.AndPredicate;
  import rtm.*;
  import rtm.predicate.SupportedCPU;
  import rtm.predicate.SupportedVM;
  
  /**