test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java

rev 53209 : Handle space in JTREG_KEYWORDS. Introduce TEST_OPTS_JAVA_OPTIONS. Set individual test timeouts to 300. Fix InstrumentationTest to handle deep work dir paths better.

*** 118,128 ****
                  "-cp", appJar,
                  "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:+WhiteBoxAPI",
                  "-Xshare:off",
                  agentCmdArg,
!                 "InstrumentationApp", bootJar, appJar, custJar, flagFile);
          TestCommon.executeAndLog(pb, "no-sharing").shouldHaveExitValue(0);
          checkAttach(t);
  
          // Dump the AppCDS archive. On some platforms AppCDSv2 may not be enabled, so we
          // first try the v2 classlist, and if that fails, revert to the v1 classlist.
--- 118,128 ----
                  "-cp", appJar,
                  "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:+WhiteBoxAPI",
                  "-Xshare:off",
                  agentCmdArg,
!                 "InstrumentationApp", flagFile, bootJar, appJar, custJar);
          TestCommon.executeAndLog(pb, "no-sharing").shouldHaveExitValue(0);
          checkAttach(t);
  
          // Dump the AppCDS archive. On some platforms AppCDSv2 may not be enabled, so we
          // first try the v2 classlist, and if that fails, revert to the v1 classlist.
*** 153,163 ****
          out = TestCommon.execAuto("-cp", appJar,
                  bootCP,
                  "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:+WhiteBoxAPI",
                  agentCmdArg,
!                "InstrumentationApp", bootJar, appJar, custJar, flagFile);
  
          CDSOptions opts = (new CDSOptions()).setXShareMode("auto");
          TestCommon.checkExec(out, opts);
          checkAttach(t);
      }
--- 153,163 ----
          out = TestCommon.execAuto("-cp", appJar,
                  bootCP,
                  "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:+WhiteBoxAPI",
                  agentCmdArg,
!                "InstrumentationApp", flagFile, bootJar, appJar, custJar);
  
          CDSOptions opts = (new CDSOptions()).setXShareMode("auto");
          TestCommon.checkExec(out, opts);
          checkAttach(t);
      }