test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java

*** 91,100 ****
--- 91,104 ----
          Files.copy(mainJar, mainJar2);
  
      }
  
      public static void main(String... args) throws Exception {
+         run();
+     }
+ 
+     public static void run(String... extra_runtime_args) throws Exception {
          // compile the modules and create the modular jar files
          buildTestModule();
          String appClasses[] = {MAIN_CLASS, APP_CLASS};
          // create an archive with the classes in the modules built in the
          // previous step
*** 102,111 ****
--- 106,116 ----
                                          null, appClasses,
                                          "--module-path", moduleDir.toString(),
                                          "-m", MAIN_MODULE);
          TestCommon.checkDump(output);
          String prefix[] = {"-Djava.class.path=", "-Xlog:class+load=trace"};
+         prefix = TestCommon.concat(prefix, extra_runtime_args);
  
          // run with the archive with the --module-path the same as the one during
          // dump time. The classes should be loaded from the archive.
          TestCommon.runWithModules(prefix,
                                    null, // --upgrade-module-path