8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jvmti

Reviewed-by: cjplummer, sspitsyn

Author: iignatev

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/TestDescription.java

@@ -47,9 +47,7 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @build ExecDriver
- *        nsk.jvmti.AddCapabilities.addcaps003
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @run main/othervm/native
  *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:+PrintInterpreter
  *      -XX:+IgnoreUnrecognizedVMOptions

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch001/TestDescription.java

@@ -62,9 +62,9 @@
  * @run driver nsk.share.ExtraClassesBuilder
  *      newclass
  *
- * @build ExecDriver
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=onload segment1=./bin/newclass"
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=onload,segment1=./bin/newclass
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch001
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch002/TestDescription.java

@@ -88,10 +88,10 @@
  * @run driver nsk.share.ExtraClassesBuilder
  *      newclass
  *
- * @build ExecDriver
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
  *      -Xbootclasspath/a:./bin/loadclass
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=onload segment1=./bin/newclass"
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=onload,segment1=./bin/newclass
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch002
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch003/TestDescription.java

@@ -73,10 +73,10 @@
  * @run driver nsk.share.ExtraClassesBuilder
  *      newclass
  *
- * @build ExecDriver
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
  *      -Xbootclasspath/a:./bin/loadclass
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=onload segment1=./bin/newclass"
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=onload,segment1=./bin/newclass
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch003
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch004/TestDescription.java

@@ -69,9 +69,9 @@
  * @run driver nsk.share.ExtraClassesBuilder
  *      newclass02 newclass01
  *
- * @build ExecDriver
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=onload segment1=./bin/newclass01 segment2=./bin/newclass02"
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=onload,segment1=./bin/newclass01,segment2=./bin/newclass02
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch004
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch007/TestDescription.java

@@ -77,16 +77,16 @@
  *      ../bootclssearch003/newclass
  *
  * @comment create bootclssearch003.jar in current directory
- * @build ExecDriver
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ * @run driver ExecDriver --cmd
  *      ${compile.jdk}/bin/jar
  *      -cf bootclssearch003.jar
  *      -C ./bin/newclass/
  *      nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch003.class
  *
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
  *      -Xbootclasspath/a:./bin/loadclass
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=live segment1=./bootclssearch003.jar"
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=live,segment1=./bootclssearch003.jar
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch003
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch008/TestDescription.java

@@ -77,23 +77,22 @@
  *      ../bootclssearch004/newclass02
  *
  * @comment create bootclssearch004.jar in ./bin/newclass01/
- * @build ExecDriver
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ * @run driver ExecDriver --cmd
  *      ${compile.jdk}/bin/jar
  *      -cf ./bin/newclass01/bootclssearch004.jar
  *      -C ./bin/newclass01/
  *      nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch004.class
  *
  * @comment create bootclssearch004.jar in ./bin/newclass02/
- * @build ExecDriver
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ * @run driver ExecDriver --cmd
  *      ${compile.jdk}/bin/jar
  *      -cf ./bin/newclass02/bootclssearch004.jar
  *      -C ./bin/newclass02/
  *      nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch004.class
  *
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=live segment1=./bin/newclass01/bootclssearch004.jar segment2=./bin/newclass02/bootclssearch004.jar"
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=live,segment1=./bin/newclass01/bootclssearch004.jar,segment2=./bin/newclass02/bootclssearch004.jar
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch004
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch009/TestDescription.java

@@ -65,15 +65,15 @@
  *      ../bootclssearch001/newclass
  *
  * @comment create bootclssearch001.jar in current directory
- * @build ExecDriver
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ * @run driver ExecDriver --cmd
  *      ${compile.jdk}/bin/jar
  *      -cf bootclssearch001.jar
  *      -C ./bin/newclass/
  *      nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch001.class
  *
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=live segment1=./bootclssearch001.jar"
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=live,segment1=./bootclssearch001.jar
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch001
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch010/TestDescription.java

@@ -93,16 +93,16 @@
  *      ../bootclssearch002/newclass
  *
  * @comment create bootclssearch002.jar in current directory
- * @build ExecDriver
- * @run driver PropertyResolvingWrapper ExecDriver --cmd
+ * @run driver ExecDriver --cmd
  *      ${compile.jdk}/bin/jar
  *      -cf bootclssearch002.jar
  *      -C ./bin/newclass/
  *      nsk/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch002.class
  *
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
  *      -Xbootclasspath/a:./bin/loadclass
- *      "-agentlib:bootclssearch_agent=-waittime=5 phasetocheck=live segment1=./bootclssearch002.jar"
+ *      -agentlib:bootclssearch_agent=-waittime=5,phasetocheck=live,segment1=./bootclssearch002.jar
  *      nsk.jvmti.AddToBootstrapClassLoaderSearch.bootclssearch002
  */
 

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddToSystemClassLoaderSearch/systemclssearch001/TestDescription.java

@@ -62,10 +62,10 @@
  * @run driver nsk.share.ExtraClassesBuilder
  *      newclass
  *
- * @build ExecDriver
- * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
+ * @comment ExecDriver is used b/c main class isn't on source/class path
+ * @run main/othervm/native ExecDriver --java
  *      -cp ${test.class.path}${path.separator}./bin/newclass
- *      "-agentlib:systemclssearch_agent=-waittime=5 phasetocheck=onload segment1=./bin/newclass"
+ *      -agentlib:systemclssearch_agent=-waittime=5,phasetocheck=onload,segment1=./bin/newclass
  *      nsk.jvmti.AddToSystemClassLoaderSearch.systemclssearch001
  */