test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java

rev 51054 : imported patch 9000013-aixDisableJFR-requires.patch

*** 20,54 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /*
   * @test
   * @summary Test relevant combinations of command line flags with shared strings
!  * @requires vm.cds.archived.java.heap
   * @library /test/lib /test/hotspot/jtreg/runtime/appcds
   * @modules java.base/jdk.internal.misc
   * @modules java.management
   *          jdk.jartool/sun.tools.jar
   * @build HelloString
   * @run main FlagCombo
   */
  
  import jdk.test.lib.BuildHelper;
  
  public class FlagCombo {
      public static void main(String[] args) throws Exception {
          SharedStringsUtils.buildJar("HelloString");
  
          SharedStringsUtils.dump(TestCommon.list("HelloString"),
              "SharedStringsBasic.txt");
  
          SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseG1GC");
  
          SharedStringsUtils.runWithArchiveAuto("HelloString",
             "-XX:StartFlightRecording=dumponexit=true");
  
          SharedStringsUtils.runWithArchive("HelloString", "-XX:+UnlockDiagnosticVMOptions",
             "-XX:NativeMemoryTracking=detail", "-XX:+PrintNMTStatistics");
      }
  }
--- 20,70 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! /**
   * @test
   * @summary Test relevant combinations of command line flags with shared strings
!  * @requires vm.cds.archived.java.heap & vm.hasJFR
   * @library /test/lib /test/hotspot/jtreg/runtime/appcds
   * @modules java.base/jdk.internal.misc
   * @modules java.management
   *          jdk.jartool/sun.tools.jar
   * @build HelloString
   * @run main FlagCombo
   */
  
+ /**
+  * @test
+  * @summary Test relevant combinations of command line flags with shared strings
+  * @comment A special test excluding the case that requires JFR
+  * @requires vm.cds.archived.java.heap & !vm.hasJFR
+  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
+  * @modules java.base/jdk.internal.misc
+  * @modules java.management
+  *          jdk.jartool/sun.tools.jar
+  * @build HelloString
+  * @run main FlagCombo noJfr
+  */
+ 
  import jdk.test.lib.BuildHelper;
+ import jdk.test.lib.Platform;
  
  public class FlagCombo {
      public static void main(String[] args) throws Exception {
          SharedStringsUtils.buildJar("HelloString");
  
          SharedStringsUtils.dump(TestCommon.list("HelloString"),
              "SharedStringsBasic.txt");
  
          SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseG1GC");
          
+         if (args.length == 0) {
              SharedStringsUtils.runWithArchiveAuto("HelloString",
                  "-XX:StartFlightRecording=dumponexit=true");
+         }
  
          SharedStringsUtils.runWithArchive("HelloString", "-XX:+UnlockDiagnosticVMOptions",
             "-XX:NativeMemoryTracking=detail", "-XX:+PrintNMTStatistics");
      }
  }