Skip to content

Commit

Permalink
8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb
Browse files Browse the repository at this point in the history
Reviewed-by: shade, cjplummer, sspitsyn
  • Loading branch information
iignatev committed Sep 30, 2020
1 parent a55cde4 commit 1eca634
Show file tree
Hide file tree
Showing 66 changed files with 189 additions and 181 deletions.
2 changes: 0 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/jdb/TEST.properties

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.caught_exception.caught_exception002.caught_exception002
* nsk.jdb.caught_exception.caught_exception002.caught_exception002a
* @run main/othervm PropertyResolvingWrapper
* @build nsk.jdb.caught_exception.caught_exception002.caught_exception002a
* @run main/othervm
* nsk.jdb.caught_exception.caught_exception002.caught_exception002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.classes.classes001.classes001
* nsk.jdb.classes.classes001.classes001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.classes.classes001.classes001
* @build nsk.jdb.classes.classes001.classes001a
* @run main/othervm
* nsk.jdb.classes.classes001.classes001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.classpath.classpath001.classpath001
* nsk.jdb.classpath.classpath001.classpath001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.classpath.classpath001.classpath001
* @build nsk.jdb.classpath.classpath001.classpath001a
* @run main/othervm
* nsk.jdb.classpath.classpath001.classpath001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.clear.clear002.clear002
* nsk.jdb.clear.clear002.clear002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear002.clear002
* @build nsk.jdb.clear.clear002.clear002a
* @run main/othervm
* nsk.jdb.clear.clear002.clear002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.clear.clear003.clear003
* nsk.jdb.clear.clear003.clear003a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear003.clear003
* @build nsk.jdb.clear.clear003.clear003a
* @run main/othervm
* nsk.jdb.clear.clear003.clear003
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.clear.clear004.clear004
* nsk.jdb.clear.clear004.clear004a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear004.clear004
* @build nsk.jdb.clear.clear004.clear004a
* @run main/othervm
* nsk.jdb.clear.clear004.clear004
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.down.down002.down002
* nsk.jdb.down.down002.down002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.down.down002.down002
* @build nsk.jdb.down.down002.down002a
* @run main/othervm
* nsk.jdb.down.down002.down002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.dump.dump002.dump002
* nsk.jdb.dump.dump002.dump002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.dump.dump002.dump002
* @build nsk.jdb.dump.dump002.dump002a
* @run main/othervm
* nsk.jdb.dump.dump002.dump002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
* @clean nsk.jdb.eval.eval001.eval001a
* @compile -g:lines,source,vars eval001a.java
*
* @run main/othervm PropertyResolvingWrapper nsk.jdb.eval.eval001.eval001
* @run main/othervm
* nsk.jdb.eval.eval001.eval001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.exclude.exclude001.exclude001
* nsk.jdb.exclude.exclude001.exclude001a
* @run main/othervm/timeout=600 PropertyResolvingWrapper nsk.jdb.exclude.exclude001.exclude001
* @build nsk.jdb.exclude.exclude001.exclude001a
* @run main/othervm/timeout=600
* nsk.jdb.exclude.exclude001.exclude001
* -arch=${os.family}-${os.simpleArch}
* -waittime=10
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.fields.fields001.fields001
* nsk.jdb.fields.fields001.fields001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.fields.fields001.fields001
* @build nsk.jdb.fields.fields001.fields001a
* @run main/othervm
* nsk.jdb.fields.fields001.fields001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
* /test/lib
* @modules jdk.jdi
* jdk.jdwp.agent
* @build nsk.jdb.hidden_class.hc001.hc001
* nsk.jdb.hidden_class.hc001.hc001a
* @build nsk.jdb.hidden_class.hc001.hc001a
*
* @run main/othervm PropertyResolvingWrapper nsk.jdb.hidden_class.hc001.hc001
* @run main/othervm
* nsk.jdb.hidden_class.hc001.hc001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.ignore.ignore001.ignore001
* nsk.jdb.ignore.ignore001.ignore001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.ignore.ignore001.ignore001
* @build nsk.jdb.ignore.ignore001.ignore001a
* @run main/othervm
* nsk.jdb.ignore.ignore001.ignore001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.interrupt.interrupt001.interrupt001
* nsk.jdb.interrupt.interrupt001.interrupt001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.interrupt.interrupt001.interrupt001
* @build nsk.jdb.interrupt.interrupt001.interrupt001a
* @run main/othervm
* nsk.jdb.interrupt.interrupt001.interrupt001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.kill.kill001.kill001
* nsk.jdb.kill.kill001.kill001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.kill.kill001.kill001
* @build nsk.jdb.kill.kill001.kill001a
* @run main/othervm
* nsk.jdb.kill.kill001.kill001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.kill.kill002.kill002
* nsk.jdb.kill.kill002.kill002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.kill.kill002.kill002
* @build nsk.jdb.kill.kill002.kill002a
* @run main/othervm
* nsk.jdb.kill.kill002.kill002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.klass.class001.class001
* nsk.jdb.klass.class001.class001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.klass.class001.class001
* @build nsk.jdb.klass.class001.class001a
* @run main/othervm
* nsk.jdb.klass.class001.class001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
10 changes: 5 additions & 5 deletions test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -42,18 +42,18 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.list.list002.list002
* nsk.jdb.list.list002.list002a
* @build nsk.jdb.list.list002.list002a
* @run driver jdk.test.lib.FileInstaller list002a.java src/nsk/jdb/list/list002/list002a.java
* @run main/othervm PropertyResolvingWrapper nsk.jdb.list.list002.list002
* @run main/othervm
* nsk.jdb.list.list002.list002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
* -transport.address=dynamic
* -jdb=${test.jdk}/bin/jdb
* -java.options="${test.vm.opts} ${test.java.opts}"
* -workdir=.
* "-jdb.option=-sourcepath src/"
* -jdb.option="-sourcepath src/"
* -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
* @clean nsk.jdb.locals.locals002.locals002a
* @compile -g:lines,source,vars locals002a.java
*
* @run main/othervm PropertyResolvingWrapper nsk.jdb.locals.locals002.locals002
* @run main/othervm
* nsk.jdb.locals.locals002.locals002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.methods.methods002.methods002
* nsk.jdb.methods.methods002.methods002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.methods.methods002.methods002
* @build nsk.jdb.methods.methods002.methods002a
* @run main/othervm
* nsk.jdb.methods.methods002.methods002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.monitor.monitor001.monitor001
* nsk.jdb.monitor.monitor001.monitor001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.monitor.monitor001.monitor001
* @build nsk.jdb.monitor.monitor001.monitor001a
* @run main/othervm
* nsk.jdb.monitor.monitor001.monitor001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.monitor.monitor002.monitor002
* nsk.jdb.monitor.monitor002.monitor002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.monitor.monitor002.monitor002
* @build nsk.jdb.monitor.monitor002.monitor002a
* @run main/othervm
* nsk.jdb.monitor.monitor002.monitor002
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.next.next001.next001
* nsk.jdb.next.next001.next001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.next.next001.next001
* @build nsk.jdb.next.next001.next001a
* @run main/othervm
* nsk.jdb.next.next001.next001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
*
* @library /vmTestbase
* /test/lib
* @build nsk.jdb.options.connect.connect001.connect001
* nsk.jdb.options.connect.connect001.connect001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect001.connect001
* @build nsk.jdb.options.connect.connect001.connect001a
* @run main/othervm
* nsk.jdb.options.connect.connect001.connect001
* -arch=${os.family}-${os.simpleArch}
* -waittime=5
* -debugee.vmkind=java
Expand Down