Skip to content

Commit

Permalink
8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/j…
Browse files Browse the repository at this point in the history
…vmti

Reviewed-by: cjplummer, sspitsyn
  • Loading branch information
iignatev committed Sep 30, 2020
1 parent 092c227 commit ca0e014
Show file tree
Hide file tree
Showing 165 changed files with 450 additions and 585 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
* ../bootclssearch001/newclass
*