ART: More refactor for JVMTI run tests (1/3)
Put (most) tests into a new package and give them dedicated
class names (Test9XY).
NOTE: BROKEN WITHOUT A FOLLOW-UP CL TO CHANGE DIRECTORY STRUCTURE
AND FILE NAMES!
Bug: 32072923
Test: None
Change-Id: I291b0543f7782914e446a74f0d9037020c88e5b5
diff --git a/test/911-get-stack-trace/src/AllTraces.java b/test/911-get-stack-trace/src/AllTraces.java
index 1d9aa96..d73f78b 100644
--- a/test/911-get-stack-trace/src/AllTraces.java
+++ b/test/911-get-stack-trace/src/AllTraces.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/test/911-get-stack-trace/src/ControlData.java b/test/911-get-stack-trace/src/ControlData.java
index 76ac4b8..b5f3291 100644
--- a/test/911-get-stack-trace/src/ControlData.java
+++ b/test/911-get-stack-trace/src/ControlData.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
import java.util.concurrent.CountDownLatch;
public class ControlData {
diff --git a/test/911-get-stack-trace/src/Frames.java b/test/911-get-stack-trace/src/Frames.java
index 54d4165..b3d81bf 100644
--- a/test/911-get-stack-trace/src/Frames.java
+++ b/test/911-get-stack-trace/src/Frames.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
import java.util.Arrays;
public class Frames {
diff --git a/test/911-get-stack-trace/src/Main.java b/test/911-get-stack-trace/src/Main.java
index 96a427d..71a5196 100644
--- a/test/911-get-stack-trace/src/Main.java
+++ b/test/911-get-stack-trace/src/Main.java
@@ -14,9 +14,14 @@
* limitations under the License.
*/
-public class Main {
- public static void main(String[] args) throws Exception {
- bindTest911Classes();
+package art;
+
+public class Test911 {
+ public static void run() throws Exception {
+ Main.bindAgentJNIForClass(AllTraces.class);
+ Main.bindAgentJNIForClass(Frames.class);
+ Main.bindAgentJNIForClass(PrintThread.class);
+ Main.bindAgentJNIForClass(ThreadListTraces.class);
SameThread.doTest();
@@ -42,6 +47,4 @@
System.out.println("Done");
}
-
- private static native void bindTest911Classes();
}
diff --git a/test/911-get-stack-trace/src/OtherThread.java b/test/911-get-stack-trace/src/OtherThread.java
index 0a78523..675bff5 100644
--- a/test/911-get-stack-trace/src/OtherThread.java
+++ b/test/911-get-stack-trace/src/OtherThread.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
public class OtherThread {
public static void doTestOtherThreadWait() throws Exception {
System.out.println("################################");
diff --git a/test/911-get-stack-trace/src/PrintThread.java b/test/911-get-stack-trace/src/PrintThread.java
index 136fd80..de1da9c 100644
--- a/test/911-get-stack-trace/src/PrintThread.java
+++ b/test/911-get-stack-trace/src/PrintThread.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/test/911-get-stack-trace/src/Recurse.java b/test/911-get-stack-trace/src/Recurse.java
index 439fbaa..438fdfd 100644
--- a/test/911-get-stack-trace/src/Recurse.java
+++ b/test/911-get-stack-trace/src/Recurse.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
public class Recurse {
public static int foo(int x, int start, int max, ControlData data) {
bar(x, start, max, data);
diff --git a/test/911-get-stack-trace/src/SameThread.java b/test/911-get-stack-trace/src/SameThread.java
index f1e19e3..c9afad5 100644
--- a/test/911-get-stack-trace/src/SameThread.java
+++ b/test/911-get-stack-trace/src/SameThread.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
public class SameThread {
public static void doTest() throws Exception {
System.out.println("###################");
diff --git a/test/911-get-stack-trace/src/ThreadListTraces.java b/test/911-get-stack-trace/src/ThreadListTraces.java
index 14868e9..0de93de 100644
--- a/test/911-get-stack-trace/src/ThreadListTraces.java
+++ b/test/911-get-stack-trace/src/ThreadListTraces.java
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+package art;
+
public class ThreadListTraces {
public static void doTest() throws Exception {
System.out.println("########################################");