test/hotspot/jtreg/runtime/appcds/customLoader/HelloCustom.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 26,37 ****
   * @test
   * @summary Hello World test for AppCDS custom loader support
   * @requires vm.cds
   * @requires vm.cds.custom.loaders
   * @library /test/lib /test/hotspot/jtreg/runtime/appcds
-  * @modules java.base/jdk.internal.misc
-  *          java.management
   * @compile test-classes/Hello.java test-classes/CustomLoadee.java
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller -jar hello.jar Hello
   * @run driver ClassFileInstaller -jar hello_custom.jar CustomLoadee
   * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
--- 26,35 ----
*** 41,50 ****
--- 39,51 ----
  import jdk.test.lib.process.OutputAnalyzer;
  import sun.hotspot.WhiteBox;
  
  public class HelloCustom {
      public static void main(String[] args) throws Exception {
+         run();
+     }
+     public static void run(String... extra_runtime_args) throws Exception {
          String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar");
          String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar;
  
          String appJar = ClassFileInstaller.getJarPath("hello.jar");
          String customJarPath = ClassFileInstaller.getJarPath("hello_custom.jar");
*** 60,73 ****
          TestCommon.testDump(appJar, classlist,
                              // command-line arguments ...
                              use_whitebox_jar);
  
          output = TestCommon.exec(appJar,
                                   // command-line arguments ...
                                   use_whitebox_jar,
                                   "-XX:+UnlockDiagnosticVMOptions",
                                   "-XX:+WhiteBoxAPI",
!                                  "Hello", customJarPath);
          TestCommon.checkExec(output);
      }
  }
  
--- 61,75 ----
          TestCommon.testDump(appJar, classlist,
                              // command-line arguments ...
                              use_whitebox_jar);
  
          output = TestCommon.exec(appJar,
+                                  TestCommon.concat(extra_runtime_args,
                                       // command-line arguments ...
                                       use_whitebox_jar,
                                       "-XX:+UnlockDiagnosticVMOptions",
                                       "-XX:+WhiteBoxAPI",
!                                      "Hello", customJarPath));
          TestCommon.checkExec(output);
      }
  }