8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb
Reviewed-by: shade, cjplummer, sspitsyn
This commit is contained in:
Igor Ignatyev
parent
a55cde4d6b
commit
1eca634736
@ -1,2 +0,0 @@
|
||||
# disabled till JDK-8252000 is fixed
|
||||
allowSmartActionArgs=false
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
@ -42,10 +42,10 @@
|
||||
*
|
||||
* @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
|
||||
@ -53,7 +53,7 @@
|
||||
* -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}"
|
||||
*/
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.options.connect.connect002.connect002
|
||||
* nsk.jdb.options.connect.connect002.connect002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect002.connect002
|
||||
* @build nsk.jdb.options.connect.connect002.connect002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.options.connect.connect002.connect002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.options.connect.connect003.connect003
|
||||
* nsk.jdb.options.connect.connect003.connect003a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect003.connect003
|
||||
* @build nsk.jdb.options.connect.connect003.connect003a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.options.connect.connect003.connect003
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.options.connect.connect004.connect004
|
||||
* nsk.jdb.options.connect.connect004.connect004a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect004.connect004
|
||||
* @build nsk.jdb.options.connect.connect004.connect004a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.options.connect.connect004.connect004
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.options.connect.connect005.connect005
|
||||
* nsk.jdb.options.connect.connect005.connect005a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect005.connect005
|
||||
* @build nsk.jdb.options.connect.connect005.connect005a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.options.connect.connect005.connect005
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -51,8 +51,7 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.options.listconnectors.listconnectors001.listconnectors001
|
||||
* @run main/othervm PropertyResolvingWrapper
|
||||
* @run main/othervm
|
||||
* nsk.jdb.options.listconnectors.listconnectors001.listconnectors001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
|
||||
@ -46,9 +46,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.pop.pop001.pop001
|
||||
* nsk.jdb.pop.pop001.pop001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.pop.pop001.pop001
|
||||
* @build nsk.jdb.pop.pop001.pop001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.pop.pop001.pop001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -33,9 +33,8 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.pop_exception.pop_exception001.pop_exception001
|
||||
* nsk.jdb.pop_exception.pop_exception001.pop_exception001a
|
||||
* @run main/othervm PropertyResolvingWrapper
|
||||
* @build nsk.jdb.pop_exception.pop_exception001.pop_exception001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.pop_exception.pop_exception001.pop_exception001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
|
||||
@ -52,7 +52,8 @@
|
||||
* @clean nsk.jdb.print.print002.print002a
|
||||
* @compile -g:lines,source,vars print002a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.print.print002.print002
|
||||
* @run main/othervm
|
||||
* nsk.jdb.print.print002.print002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -52,7 +52,8 @@
|
||||
* @clean nsk.jdb.read.read001.read001a
|
||||
* @compile -g:lines,source,vars read001a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.read.read001.read001
|
||||
* @run main/othervm
|
||||
* nsk.jdb.read.read001.read001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,19 +45,19 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.redefine.redefine001.redefine001
|
||||
* nsk.jdb.redefine.redefine001.redefine001a
|
||||
* @build nsk.jdb.redefine.redefine001.redefine001a
|
||||
*
|
||||
* @comment compile newclass_g/RedefinedClass.java to newclass_g
|
||||
* @build ExecDriver
|
||||
* @run driver PropertyResolvingWrapper ExecDriver --cmd
|
||||
* @run driver
|
||||
* ExecDriver --cmd
|
||||
* ${compile.jdk}/bin/javac
|
||||
* -d ${test.classes}/newclass_g
|
||||
* -g:lines,source,vars
|
||||
* -cp ${test.class.path}
|
||||
* ${test.src}/newclass_g/RedefinedClass.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.redefine.redefine001.redefine001
|
||||
* @run main/othervm
|
||||
* nsk.jdb.redefine.redefine001.redefine001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.reenter.reenter001.reenter001
|
||||
* nsk.jdb.reenter.reenter001.reenter001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.reenter.reenter001.reenter001
|
||||
* @build nsk.jdb.reenter.reenter001.reenter001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.reenter.reenter001.reenter001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -94,14 +94,15 @@
|
||||
* nsk.jdb.regression.b4689395.b4689395a
|
||||
*
|
||||
* @comment compile newclass/b4689395a.java to newclass
|
||||
* @build ExecDriver
|
||||
* @run driver PropertyResolvingWrapper ExecDriver --cmd
|
||||
* @run driver
|
||||
* ExecDriver --cmd
|
||||
* ${compile.jdk}/bin/javac
|
||||
* -d ${test.classes}/newclass
|
||||
* -cp ${test.class.path}
|
||||
* ${test.src}/newclass/b4689395a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.regression.b4689395.b4689395
|
||||
* @run main/othervm
|
||||
* nsk.jdb.regression.b4689395.b4689395
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -49,9 +49,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.resume.resume002.resume002
|
||||
* nsk.jdb.resume.resume002.resume002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.resume.resume002.resume002
|
||||
* @build nsk.jdb.resume.resume002.resume002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.resume.resume002.resume002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -43,9 +43,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.run.run002.run002
|
||||
* nsk.jdb.run.run002.run002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.run.run002.run002
|
||||
* @build nsk.jdb.run.run002.run002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.run.run002.run002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -53,7 +53,8 @@
|
||||
* @clean nsk.jdb.set.set001.set001a
|
||||
* @compile -g:lines,source,vars set001a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.set.set001.set001
|
||||
* @run main/othervm
|
||||
* nsk.jdb.set.set001.set001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -53,7 +53,8 @@
|
||||
* @clean nsk.jdb.set.set002.set002a
|
||||
* @compile -g:lines,source,vars set002a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.set.set002.set002
|
||||
* @run main/othervm
|
||||
* nsk.jdb.set.set002.set002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -56,7 +56,8 @@
|
||||
* @clean nsk.jdb.step.step002.step002a
|
||||
* @compile -g:lines,source,vars step002a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.step.step002.step002
|
||||
* @run main/othervm
|
||||
* nsk.jdb.step.step002.step002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -44,9 +44,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.step_up.step_up001.step_up001
|
||||
* nsk.jdb.step_up.step_up001.step_up001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.step_up.step_up001.step_up001
|
||||
* @build nsk.jdb.step_up.step_up001.step_up001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.step_up.step_up001.step_up001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -36,9 +36,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.stop_at.stop_at002.stop_at002
|
||||
* nsk.jdb.stop_at.stop_at002.stop_at002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.stop_at.stop_at002.stop_at002
|
||||
* @build nsk.jdb.stop_at.stop_at002.stop_at002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.stop_at.stop_at002.stop_at002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -48,9 +48,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.stop_at.stop_at003.stop_at003
|
||||
* nsk.jdb.stop_at.stop_at003.stop_at003a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.stop_at.stop_at003.stop_at003
|
||||
* @build nsk.jdb.stop_at.stop_at003.stop_at003a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.stop_at.stop_at003.stop_at003
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -49,9 +49,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.stop_in.stop_in002.stop_in002
|
||||
* nsk.jdb.stop_in.stop_in002.stop_in002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.stop_in.stop_in002.stop_in002
|
||||
* @build nsk.jdb.stop_in.stop_in002.stop_in002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.stop_in.stop_in002.stop_in002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -45,9 +45,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.suspend.suspend001.suspend001
|
||||
* nsk.jdb.suspend.suspend001.suspend001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.suspend.suspend001.suspend001
|
||||
* @build nsk.jdb.suspend.suspend001.suspend001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.suspend.suspend001.suspend001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -42,9 +42,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.thread.thread002.thread002
|
||||
* nsk.jdb.thread.thread002.thread002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.thread.thread002.thread002
|
||||
* @build nsk.jdb.thread.thread002.thread002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.thread.thread002.thread002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -40,9 +40,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.threadgroup.threadgroup002.threadgroup002
|
||||
* nsk.jdb.threadgroup.threadgroup002.threadgroup002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threadgroup.threadgroup002.threadgroup002
|
||||
* @build nsk.jdb.threadgroup.threadgroup002.threadgroup002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.threadgroup.threadgroup002.threadgroup002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -40,9 +40,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.threadgroups.threadgroups002.threadgroups002
|
||||
* nsk.jdb.threadgroups.threadgroups002.threadgroups002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threadgroups.threadgroups002.threadgroups002
|
||||
* @build nsk.jdb.threadgroups.threadgroups002.threadgroups002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.threadgroups.threadgroups002.threadgroups002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -39,9 +39,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.threads.threads002.threads002
|
||||
* nsk.jdb.threads.threads002.threads002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threads.threads002.threads002
|
||||
* @build nsk.jdb.threads.threads002.threads002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.threads.threads002.threads002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -46,9 +46,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.trace.trace001.trace001
|
||||
* nsk.jdb.trace.trace001.trace001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.trace.trace001.trace001
|
||||
* @build nsk.jdb.trace.trace001.trace001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.trace.trace001.trace001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
* @clean nsk.jdb.uncaught_exception.uncaught_exception002.uncaught_exception002a
|
||||
* @compile -g:lines,source,vars uncaught_exception002a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper
|
||||
* @run main/othervm
|
||||
* nsk.jdb.uncaught_exception.uncaught_exception002.uncaught_exception002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
|
||||
@ -56,7 +56,8 @@
|
||||
* @clean nsk.jdb.unmonitor.unmonitor001.unmonitor001a
|
||||
* @compile -g:lines,source,vars unmonitor001a.java
|
||||
*
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.unmonitor.unmonitor001.unmonitor001
|
||||
* @run main/othervm
|
||||
* nsk.jdb.unmonitor.unmonitor001.unmonitor001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -53,9 +53,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.untrace.untrace001.untrace001
|
||||
* nsk.jdb.untrace.untrace001.untrace001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.untrace.untrace001.untrace001
|
||||
* @build nsk.jdb.untrace.untrace001.untrace001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.untrace.untrace001.untrace001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -49,9 +49,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.unwatch.unwatch001.unwatch001
|
||||
* nsk.jdb.unwatch.unwatch001.unwatch001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.unwatch.unwatch001.unwatch001
|
||||
* @build nsk.jdb.unwatch.unwatch001.unwatch001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.unwatch.unwatch001.unwatch001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -50,9 +50,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.unwatch.unwatch002.unwatch002
|
||||
* nsk.jdb.unwatch.unwatch002.unwatch002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.unwatch.unwatch002.unwatch002
|
||||
* @build nsk.jdb.unwatch.unwatch002.unwatch002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.unwatch.unwatch002.unwatch002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -42,9 +42,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.up.up002.up002
|
||||
* nsk.jdb.up.up002.up002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.up.up002.up002
|
||||
* @build nsk.jdb.up.up002.up002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.up.up002.up002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -42,9 +42,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.use.use001.use001
|
||||
* nsk.jdb.use.use001.use001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.use.use001.use001
|
||||
* @build nsk.jdb.use.use001.use001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.use.use001.use001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -47,9 +47,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.watch.watch001.watch001
|
||||
* nsk.jdb.watch.watch001.watch001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.watch.watch001.watch001
|
||||
* @build nsk.jdb.watch.watch001.watch001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.watch.watch001.watch001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -47,9 +47,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.watch.watch002.watch002
|
||||
* nsk.jdb.watch.watch002.watch002a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.watch.watch002.watch002
|
||||
* @build nsk.jdb.watch.watch002.watch002a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.watch.watch002.watch002
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -40,9 +40,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.where.where004.where004
|
||||
* nsk.jdb.where.where004.where004a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where004.where004
|
||||
* @build nsk.jdb.where.where004.where004a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.where.where004.where004
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -41,9 +41,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.where.where005.where005
|
||||
* nsk.jdb.where.where005.where005a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where005.where005
|
||||
* @build nsk.jdb.where.where005.where005a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.where.where005.where005
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -41,9 +41,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.where.where006.where006
|
||||
* nsk.jdb.where.where006.where006a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where006.where006
|
||||
* @build nsk.jdb.where.where006.where006a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.where.where006.where006
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -36,9 +36,9 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdb.wherei.wherei001.wherei001
|
||||
* nsk.jdb.wherei.wherei001.wherei001a
|
||||
* @run main/othervm PropertyResolvingWrapper nsk.jdb.wherei.wherei001.wherei001
|
||||
* @build nsk.jdb.wherei.wherei001.wherei001a
|
||||
* @run main/othervm
|
||||
* nsk.jdb.wherei.wherei001.wherei001
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
|
||||
@ -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
|
||||
@ -181,7 +181,11 @@ public class JdbArgumentHandler extends nsk.share.jdi.ArgumentHandler {
|
||||
* Returns command line options <code>jdb</code> was launched with.
|
||||
*/
|
||||
public String getJdbOptions() {
|
||||
return options.getProperty("jdb.option", "");
|
||||
String value = options.getProperty("jdb.option", "").trim();
|
||||
if (value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
|
||||
value = value.substring(1, value.length() - 1).trim();
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user