*** old/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java	Wed Aug 22 09:26:40 2018
--- new/test/hotspot/jtreg/runtime/appcds/javaldr/GCSharedStringsDuringDump.java	Wed Aug 22 09:26:40 2018

*** 60,71 ****
--- 60,69 ----
                                          agentClasses);
  
          String appJar =
              ClassFileInstaller.writeJar("GCSharedStringsDuringDumpApp.jar", appClasses);
  
          String gcLog = "-Xlog:gc*=info,gc+region=trace,gc+alloc+region=debug";
  
          String sharedArchiveCfgFile =
              System.getProperty("user.dir") + File.separator + "GCSharedStringDuringDump_gen.txt";
          try (FileOutputStream fos = new FileOutputStream(sharedArchiveCfgFile)) {
              PrintWriter out = new PrintWriter(new OutputStreamWriter(fos));
              out.println("VERSION: 1.0");

*** 88,98 ****
--- 86,96 ----
  
              String extraArg = (i == 0) ? "-showversion" : "-javaagent:" + agentJar;
  
              OutputAnalyzer output = TestCommon.dump(
                                  appJar, TestCommon.list("GCSharedStringsDuringDumpWb"),
-                                 bootClassPath, extraArg, "-Xmx32m", gcLog,
                                  "-XX:SharedArchiveConfigFile=" + sharedArchiveCfgFile);
  
              if (output.getStdout().contains("Too many string space regions") ||
                  output.getStderr().contains("Unable to write archive heap memory regions") ||
                  output.getStdout().contains("Try increasing NewSize") ||

*** 100,110 ****
--- 98,108 ----
                  output.getExitValue() != 0) {
                  // Try again with larger heap and NewSize, this should increase the
                  // G1 heap region size to 2M
                  TestCommon.testDump(
                      appJar, TestCommon.list("GCSharedStringsDuringDumpWb"),
-                     bootClassPath, extraArg, "-Xmx8g", "-XX:NewSize=8m", gcLog,
                      "-XX:SharedArchiveConfigFile=" + sharedArchiveCfgFile);
              }
  
              TestCommon.run(
                  "-cp", appJar,

*** 112,122 ****
--- 110,119 ----
                  "-Xmx32m",
                  "-XX:+PrintSharedSpaces",
                  "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:+WhiteBoxAPI",
                  "-XX:SharedReadOnlySize=30m",
                  gcLog,
                  "GCSharedStringsDuringDumpWb")
                .assertNormalExit();
          }
      }
  }