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

8251997: remove usage of PropertyResolvingWrapper in vmTestbase/vm/mlvm/

Browse Source 
Reviewed-by: thartmann
This commit is contained in:
Igor Ignatyev 2020-09-03 09:21:27 -07:00
parent 850d62301c
commit 933f90fbfa
7 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/vmTestbase/vm/mlvm/TEST.properties
View File

@ -1,2 +0,0 @@
# disabled till JDK-8251997 is fixed
allowSmartActionArgs=false

5
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpoint/Test.java
View File

@ -21,7 +21,6 @@
* questions. * questions.
*/ */
/* /*
* @test * @test
* *
@ -43,7 +42,7 @@
* @build vm.mlvm.indy.func.jdi.breakpoint.Test * @build vm.mlvm.indy.func.jdi.breakpoint.Test
* @run driver vm.mlvm.share.IndifiedClassesBuilder * @run driver vm.mlvm.share.IndifiedClassesBuilder
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.indy.func.jdi.breakpoint.Test * vm.mlvm.indy.func.jdi.breakpoint.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}
@ -75,10 +74,10 @@ public class Test extends JDIBreakpointTest {
result.add(new BreakpointInfo("bootstrap")); result.add(new BreakpointInfo("bootstrap"));
result.add(new BreakpointInfo("target")); result.add(new BreakpointInfo("target"));
result.add(new BreakpointInfo("stop")); result.add(new BreakpointInfo("stop"));
return result; return result;
} }
public static void main(String[] args) { public static void main(String[] args) {
launch(new ArgumentHandler(args)); launch(new ArgumentHandler(args));
} }

5
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jdi/breakpointOtherStratum/Test.java
View File

@ -21,7 +21,6 @@
* questions. * questions.
*/ */
/* /*
* @test * @test
* *
@ -49,7 +48,7 @@
* vm.mlvm.share.StratumClassesBuilder * vm.mlvm.share.StratumClassesBuilder
* vmTestbase/vm/mlvm/share/jpda/INDIFY_SDE_DebuggeeBase.java * vmTestbase/vm/mlvm/share/jpda/INDIFY_SDE_DebuggeeBase.java
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.indy.func.jdi.breakpointOtherStratum.Test * vm.mlvm.indy.func.jdi.breakpointOtherStratum.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}
@ -71,7 +70,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Test extends JDIBreakpointTest { public class Test extends JDIBreakpointTest {
@Override @Override
protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) { protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
List<BreakpointInfo> result = new ArrayList<>(); List<BreakpointInfo> result = new ArrayList<>();
@ -100,6 +98,7 @@ public class Test extends JDIBreakpointTest {
info.stratumInfo = new StratumInfo("Logo", "INDIFY_SDE_DebuggeeBase.logo", 5); info.stratumInfo = new StratumInfo("Logo", "INDIFY_SDE_DebuggeeBase.logo", 5);
result.add(info); result.add(info);
} }
return result; return result;
} }

11
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/jdi/breakpointInCompiledCode/Test.java
View File

@ -21,7 +21,6 @@
* questions. * questions.
*/ */
/* /*
* @test * @test
* *
@ -29,7 +28,8 @@
* VM Testbase keywords: [feature_mlvm, nonconcurrent, fds, jdk] * VM Testbase keywords: [feature_mlvm, nonconcurrent, fds, jdk]
* VM Testbase readme: * VM Testbase readme:
* DESCRIPTION * DESCRIPTION
* Execute an invokedynamic instruction 10000 times to trigger Hotspot compilation. Set a debugger breakpoint to invokedynamic instruction. * Execute an invokedynamic instruction 10000 times to trigger Hotspot compilation.
* Set a debugger breakpoint to invokedynamic instruction.
* Make few debugger steps, obtaining various information from JVM * Make few debugger steps, obtaining various information from JVM
* *
* @library /vmTestbase * @library /vmTestbase
@ -42,7 +42,7 @@
* @build vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test * @build vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test
* @run driver vm.mlvm.share.IndifiedClassesBuilder * @run driver vm.mlvm.share.IndifiedClassesBuilder
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test * vm.mlvm.indy.stress.jdi.breakpointInCompiledCode.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}
@ -64,9 +64,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Test extends JDIBreakpointTest { public class Test extends JDIBreakpointTest {
// bootstrap,runDebuggee=>(indyWrapper:S5000,~target,stop) // bootstrap,runDebuggee=>(indyWrapper:S5000,~target,stop)
@Override @Override
protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) { protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
List<BreakpointInfo> result = new ArrayList<>(); List<BreakpointInfo> result = new ArrayList<>();
result.add(new BreakpointInfo("bootstrap")); result.add(new BreakpointInfo("bootstrap"));
{ {
@ -88,6 +88,7 @@ public class Test extends JDIBreakpointTest {
info.subBreakpoints = subBreakpoints; info.subBreakpoints = subBreakpoints;
result.add(info); result.add(info);
} }
return result; return result;
} }

5
test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpoint/Test.java
View File

@ -21,7 +21,6 @@
* questions. * questions.
*/ */
/* /*
* @test * @test
* @key randomness * @key randomness
@ -43,7 +42,7 @@
* @build vm.mlvm.meth.func.jdi.breakpoint.Test * @build vm.mlvm.meth.func.jdi.breakpoint.Test
* @run driver vm.mlvm.share.IndifiedClassesBuilder * @run driver vm.mlvm.share.IndifiedClassesBuilder
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.meth.func.jdi.breakpoint.Test * vm.mlvm.meth.func.jdi.breakpoint.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}
@ -58,7 +57,6 @@ package vm.mlvm.meth.func.jdi.breakpoint;
import vm.mlvm.share.jdi.ArgumentHandler; import vm.mlvm.share.jdi.ArgumentHandler;
import vm.mlvm.share.jdi.BreakpointInfo; import vm.mlvm.share.jdi.BreakpointInfo;
import vm.mlvm.share.jdi.JDIBreakpointTest; import vm.mlvm.share.jdi.JDIBreakpointTest;
import vm.mlvm.share.jpda.StratumInfo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -85,7 +83,6 @@ public class Test extends JDIBreakpointTest {
return result; return result;
} }
public static void main(String[] args) { public static void main(String[] args) {
launch(new ArgumentHandler(args)); launch(new ArgumentHandler(args));
} }

7
test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java
View File

@ -21,7 +21,6 @@
* questions. * questions.
*/ */
/* /*
* @test * @test
* *
@ -49,7 +48,7 @@
* vm.mlvm.share.StratumClassesBuilder * vm.mlvm.share.StratumClassesBuilder
* vmTestbase/vm/mlvm/share/jpda/SDE_MHDebuggeeBase.java * vmTestbase/vm/mlvm/share/jpda/SDE_MHDebuggeeBase.java
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.meth.func.jdi.breakpointOtherStratum.Test * vm.mlvm.meth.func.jdi.breakpointOtherStratum.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}
@ -70,7 +69,7 @@ import vm.mlvm.share.jpda.StratumInfo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Test extends JDIBreakpointTest { public class Test extends JDIBreakpointTest {
@Override @Override
protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) { protected List<BreakpointInfo> getBreakpoints(String debuggeeClassName) {
List<BreakpointInfo> result = new ArrayList<>(); List<BreakpointInfo> result = new ArrayList<>();
@ -106,10 +105,10 @@ public class Test extends JDIBreakpointTest {
info.stratumInfo = new StratumInfo("Logo", "SDE_MHDebuggeeBase.logo", 6); info.stratumInfo = new StratumInfo("Logo", "SDE_MHDebuggeeBase.logo", 6);
result.add(info); result.add(info);
} }
return result; return result;
} }
public static void main(String[] args) { public static void main(String[] args) {
launch(new ArgumentHandler(args)); launch(new ArgumentHandler(args));
} }

2
test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java
View File

@ -43,7 +43,7 @@
* @build vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test * @build vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test
* @run driver vm.mlvm.share.IndifiedClassesBuilder * @run driver vm.mlvm.share.IndifiedClassesBuilder
* *
* @run main/othervm PropertyResolvingWrapper * @run main/othervm
* vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test * vm.mlvm.meth.stress.jdi.breakpointInCompiledCode.Test
* -verbose * -verbose
* -arch=${os.family}-${os.simpleArch} * -arch=${os.family}-${os.simpleArch}