stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8249040: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_jdb tests

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Igor Ignatyev 2020-07-15 11:34:34 -07:00
parent b27e717c56
commit e07ad838b5
63 changed files with 72 additions and 133 deletions
test/hotspot/jtreg/vmTestbase/nsk/jdb
caught_exception/caught_exception002
caught_exception002.java
classes/classes001
classes001.java
classpath/classpath001
classpath001.java
clear
clear002
clear002.java
clear003
clear003.java
clear004
clear004.java
down/down002
down002.java
dump/dump002
dump002.java
eval/eval001
eval001.java
exclude/exclude001
exclude001.java
fields/fields001
fields001.java
hidden_class/hc001
hc001.java
ignore/ignore001
ignore001.java
interrupt/interrupt001
interrupt001.java
kill
kill001
kill001.java
kill002
kill002.java
klass/class001
class001.java
locals/locals002
locals002.java
methods/methods002
methods002.java
monitor
monitor001
monitor001.java
monitor002
monitor002.java
next/next001
next001.java
options
connect
connect001
connect001.java
connect002
connect002.java
connect003
connect003.java
connect004
connect004.java
connect005
connect005.java
listconnectors/listconnectors001
listconnectors001.java
pop/pop001
pop001.java
pop_exception/pop_exception001
pop_exception001.java
print/print002
print002.java
read/read001
read001.java
redefine/redefine001
redefine001.java
reenter/reenter001
reenter001.java
regression/b4689395
b4689395.java
resume/resume002
resume002.java
run/run002
run002.java
set
set001
set001.java
set002
set002.java
step/step002
step002.java
step_up/step_up001
step_up001.java
stop_at
stop_at002
stop_at002.java
stop_at003
stop_at003.java
stop_in/stop_in002
stop_in002.java
suspend/suspend001
suspend001.java
thread/thread002
thread002.java
threadgroup/threadgroup002
threadgroup002.java
threadgroups/threadgroups002
threadgroups002.java
threads/threads002
threads002.java
trace/trace001
trace001.java
uncaught_exception/uncaught_exception002
uncaught_exception002.java
unmonitor/unmonitor001
unmonitor001.java
untrace/untrace001
untrace001.java
unwatch
unwatch001
unwatch001.java
unwatch002
unwatch002.java
up/up002
up002.java
use/use001
use001.java
watch
watch001
watch001.java
watch002
watch002.java
where
where004
where004.java
where005
where005.java
where006
where006.java
wherei/wherei001
wherei001.java

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.caught_exception.caught_exception002.caught_exception002
* nsk.jdb.caught_exception.caught_exception002.caught_exception002a
* @run main/othervm PropertyResolvingWrapper

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.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
@ -36,7 +36,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.classes.classes001.classes001
* nsk.jdb.classes.classes001.classes001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.classes.classes001.classes001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.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
@ -35,7 +35,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.classpath.classpath001.classpath001
* nsk.jdb.classpath.classpath001.classpath001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.classpath.classpath001.classpath001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.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
@ -37,7 +37,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.clear.clear002.clear002
* nsk.jdb.clear.clear002.clear002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear002.clear002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.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
@ -38,7 +38,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.clear.clear003.clear003
* nsk.jdb.clear.clear003.clear003a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear003.clear003

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.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
@ -39,7 +39,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.clear.clear004.clear004
* nsk.jdb.clear.clear004.clear004a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.clear.clear004.clear004

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.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,7 +42,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.down.down002.down002
* nsk.jdb.down.down002.down002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.down.down002.down002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.dump.dump002.dump002
* nsk.jdb.dump.dump002.dump002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.dump.dump002.dump002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.eval.eval001.eval001
*
* @comment make sure eval001a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.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
@ -58,7 +58,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.exclude.exclude001.exclude001
* nsk.jdb.exclude.exclude001.exclude001a
* @run main/othervm/timeout=600 PropertyResolvingWrapper nsk.jdb.exclude.exclude001.exclude001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.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
@ -40,7 +40,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.fields.fields001.fields001
* nsk.jdb.fields.fields001.fields001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.fields.fields001.fields001

1
test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java

@ -29,7 +29,6 @@
* /test/lib
* @modules jdk.jdi
* jdk.jdwp.agent
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.hidden_class.hc001.hc001
* nsk.jdb.hidden_class.hc001.hc001a
*

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.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
@ -39,7 +39,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.ignore.ignore001.ignore001
* nsk.jdb.ignore.ignore001.ignore001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.ignore.ignore001.ignore001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2019, 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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.interrupt.interrupt001.interrupt001
* nsk.jdb.interrupt.interrupt001.interrupt001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.interrupt.interrupt001.interrupt001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.kill.kill001.kill001
* nsk.jdb.kill.kill001.kill001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.kill.kill001.kill001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.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,7 +42,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.kill.kill002.kill002
* nsk.jdb.kill.kill002.kill002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.kill.kill002.kill002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.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
@ -39,7 +39,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.klass.class001.class001
* nsk.jdb.klass.class001.class001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.klass.class001.class001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.locals.locals002.locals002
*
* @comment make sure locals002a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -49,7 +49,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.methods.methods002.methods002
* nsk.jdb.methods.methods002.methods002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.methods.methods002.methods002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.monitor.monitor001.monitor001
* nsk.jdb.monitor.monitor001.monitor001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.monitor.monitor001.monitor001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
@ -41,7 +41,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.monitor.monitor002.monitor002
* nsk.jdb.monitor.monitor002.monitor002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.monitor.monitor002.monitor002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.next.next001.next001
* nsk.jdb.next.next001.next001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.next.next001.next001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.connect.connect001.connect001
* nsk.jdb.options.connect.connect001.connect001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect001.connect001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.connect.connect002.connect002
* nsk.jdb.options.connect.connect002.connect002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect002.connect002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.connect.connect003.connect003
* nsk.jdb.options.connect.connect003.connect003a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect003.connect003

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.connect.connect004.connect004
* nsk.jdb.options.connect.connect004.connect004a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect004.connect004

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.connect.connect005.connect005
* nsk.jdb.options.connect.connect005.connect005a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.options.connect.connect005.connect005

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -51,7 +51,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.options.listconnectors.listconnectors001.listconnectors001
* @run main/othervm PropertyResolvingWrapper
* nsk.jdb.options.listconnectors.listconnectors001.listconnectors001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.pop.pop001.pop001
* nsk.jdb.pop.pop001.pop001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.pop.pop001.pop001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -33,7 +33,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.pop_exception.pop_exception001.pop_exception001
* nsk.jdb.pop_exception.pop_exception001.pop_exception001a
* @run main/othervm PropertyResolvingWrapper

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.print.print002.print002
*
* @comment make sure print002a is compiled w/ full debug info

8
test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.read.read001.read001
*
* @comment make sure read001a is compiled w/ full debug info
@ -68,6 +67,7 @@ package nsk.jdb.read.read001;
import nsk.share.*;
import nsk.share.jdb.*;
import jdk.test.lib.Utils;
import java.io.*;
import java.util.*;
@ -96,7 +96,7 @@ public class read001 extends JdbTest {
protected void runCases() {
String[] reply;
String workdir = argumentHandler.getWorkDir();
String srcdir = Utils.TEST_SRC;
// stop in lastBreak() method
jdb.setBreakpointInMethod(LAST_BREAK);
@ -105,7 +105,7 @@ public class read001 extends JdbTest {
// return to testedInstanceMethod()
reply = jdb.receiveReplyFor(JdbCommand.step);
String command = JdbCommand.read + workdir + File.separator + SCENARIO_FILE;
String command = JdbCommand.read + srcdir + File.separator + SCENARIO_FILE;
int count = SCENARIO_COMMANDS_COUNT + 1;
reply = jdb.receiveReplyFor(command, true, count);

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.redefine.redefine001.redefine001
* nsk.jdb.redefine.redefine001.redefine001a
*

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.reenter.reenter001.reenter001
* nsk.jdb.reenter.reenter001.reenter001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.reenter.reenter001.reenter001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.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
@ -90,7 +90,6 @@
* @library /vmTestbase
* /test/lib
*
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.regression.b4689395.b4689395
* nsk.jdb.regression.b4689395.b4689395a
*

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.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
@ -49,7 +49,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.resume.resume002.resume002
* nsk.jdb.resume.resume002.resume002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.resume.resume002.resume002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.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
@ -43,7 +43,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.run.run002.run002
* nsk.jdb.run.run002.run002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.run.run002.run002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.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
@ -47,7 +47,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.set.set001.set001
*
* @comment make sure set001a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
@ -47,7 +47,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.set.set002.set002
*
* @comment make sure set002a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -50,7 +50,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.step.step002.step002
*
* @comment make sure step002a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.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
@ -44,7 +44,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @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

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.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
@ -36,7 +36,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @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

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.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
@ -48,7 +48,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @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

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.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
@ -49,7 +49,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @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

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.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
@ -45,7 +45,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.suspend.suspend001.suspend001
* nsk.jdb.suspend.suspend001.suspend001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.suspend.suspend001.suspend001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.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,7 +42,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.thread.thread002.thread002
* nsk.jdb.thread.thread002.thread002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.thread.thread002.thread002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.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
@ -40,7 +40,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.threadgroup.threadgroup002.threadgroup002
* nsk.jdb.threadgroup.threadgroup002.threadgroup002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threadgroup.threadgroup002.threadgroup002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.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
@ -40,7 +40,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.threadgroups.threadgroups002.threadgroups002
* nsk.jdb.threadgroups.threadgroups002.threadgroups002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threadgroups.threadgroups002.threadgroups002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.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
@ -39,7 +39,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.threads.threads002.threads002
* nsk.jdb.threads.threads002.threads002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.threads.threads002.threads002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.trace.trace001.trace001
* nsk.jdb.trace.trace001.trace001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.trace.trace001.trace001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.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
@ -46,7 +46,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.uncaught_exception.uncaught_exception002.uncaught_exception002
*
* @comment make sure uncaught_exception002a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.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
@ -50,7 +50,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.unmonitor.unmonitor001.unmonitor001
*
* @comment make sure unmonitor001a is compiled w/ full debug info

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.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
@ -53,7 +53,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.untrace.untrace001.untrace001
* nsk.jdb.untrace.untrace001.untrace001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.untrace.untrace001.untrace001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.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
@ -49,7 +49,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.unwatch.unwatch001.unwatch001
* nsk.jdb.unwatch.unwatch001.unwatch001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.unwatch.unwatch001.unwatch001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.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
@ -50,7 +50,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.unwatch.unwatch002.unwatch002
* nsk.jdb.unwatch.unwatch002.unwatch002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.unwatch.unwatch002.unwatch002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.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,7 +42,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.up.up002.up002
* nsk.jdb.up.up002.up002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.up.up002.up002

16
test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.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,7 +42,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.use.use001.use001
* nsk.jdb.use.use001.use001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.use.use001.use001
@ -60,6 +59,7 @@ package nsk.jdb.use.use001;
import nsk.share.*;
import nsk.share.jdb.*;
import jdk.test.lib.Utils;
import java.io.*;
import java.util.*;
@ -91,7 +91,7 @@ public class use001 extends JdbTest {
String found;
String path = "";
String workdir = argumentHandler.getWorkDir();
String srcdir = Utils.TEST_SRC;
// jdb.setBreakpointInMethod(LAST_BREAK);
// reply = jdb.receiveReplyFor(JdbCommand.cont);
@ -110,14 +110,14 @@ public class use001 extends JdbTest {
}
/*
grep = new Paragrep(reply);
count = grep.find(workdir);
count = grep.find(srcdir);
if (count == 0) {
log.complain("Not found current working directory in source file path");
log.complain("Not found current source directory in source file path");
success = false;
break;
}
*/
reply = jdb.receiveReplyFor(JdbCommand.use + workdir + File.pathSeparator + path);
reply = jdb.receiveReplyFor(JdbCommand.use + srcdir + File.pathSeparator + path);
if (reply.length == 0) {
log.complain("Empty reply on third 'use' command");
success = false;
@ -126,8 +126,8 @@ public class use001 extends JdbTest {
reply = jdb.receiveReplyFor(JdbCommand.use);
grep = new Paragrep(reply);
if (grep.find(workdir) == 0) {
log.complain("Current working directory should be in source file path");
if (grep.find(srcdir) == 0) {
log.complain("Current source directory should be in source file path");
success = false;
break;
}

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.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
@ -47,7 +47,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.watch.watch001.watch001
* nsk.jdb.watch.watch001.watch001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.watch.watch001.watch001

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.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
@ -47,7 +47,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.watch.watch002.watch002
* nsk.jdb.watch.watch002.watch002a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.watch.watch002.watch002

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.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
@ -40,7 +40,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.where.where004.where004
* nsk.jdb.where.where004.where004a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where004.where004

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.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
@ -41,7 +41,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.where.where005.where005
* nsk.jdb.where.where005.where005a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where005.where005

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.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
@ -41,7 +41,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.where.where006.where006
* nsk.jdb.where.where006.where006a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.where.where006.where006

3
test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.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
@ -36,7 +36,6 @@
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.wherei.wherei001.wherei001
* nsk.jdb.wherei.wherei001.wherei001a
* @run main/othervm PropertyResolvingWrapper nsk.jdb.wherei.wherei001.wherei001