Skip to content
Permalink
Browse files
8252000: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdb
Reviewed-by: shade, cjplummer, sspitsyn
  • Loading branch information
iignatev committed Sep 30, 2020
1 parent a55cde4 commit 1eca634736f1414f4dd799927189ed1f3bd5e450
Showing with 189 additions and 181 deletions.
  1. +0 −2 test/hotspot/jtreg/vmTestbase/nsk/jdb/TEST.properties
  2. +2 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.java
  3. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.java
  4. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.java
  5. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.java
  6. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
  7. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
  8. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.java
  9. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java
  10. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.java
  11. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java
  12. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.java
  13. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java
  14. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.java
  15. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java
  16. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.java
  17. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.java
  18. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.java
  19. +5 −5 test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java
  20. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.java
  21. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java
  22. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.java
  23. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
  24. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.java
  25. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java
  26. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java
  27. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java
  28. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java
  29. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java
  30. +1 −2 .../hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java
  31. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java
  32. +2 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java
  33. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java
  34. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.java
  35. +5 −5 test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.java
  36. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java
  37. +4 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.java
  38. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.java
  39. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.java
  40. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.java
  41. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java
  42. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java
  43. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.java
  44. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
  45. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.java
  46. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.java
  47. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.java
  48. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.java
  49. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
  50. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.java
  51. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.java
  52. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java
  53. +1 −1 ...spot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.java
  54. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
  55. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.java
  56. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.java
  57. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java
  58. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.java
  59. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
  60. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.java
  61. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.java
  62. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.java
  63. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.java
  64. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.java
  65. +3 −3 test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.java
  66. +6 −2 test/hotspot/jtreg/vmTestbase/nsk/share/jdb/JdbArgumentHandler.java

This file was deleted.

@@ -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,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}"
*/

@@ -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
Loading

1 comment on commit 1eca634

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on 1eca634 Sep 30, 2020

Please sign in to comment.