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/904-object-allocation/src/Main.java b/test/904-object-allocation/src/Main.java
index df59179..31e0c8c 100644
--- a/test/904-object-allocation/src/Main.java
+++ b/test/904-object-allocation/src/Main.java
@@ -14,10 +14,14 @@
* limitations under the License.
*/
+package art;
+
import java.util.ArrayList;
-public class Main {
- public static void main(String[] args) throws Exception {
+public class Test904 {
+ public static void run() throws Exception {
+ Main.bindAgentJNIForClass(Test904.class);
+
// Use a list to ensure objects must be allocated.
ArrayList<Object> l = new ArrayList<>(100);
diff --git a/test/904-object-allocation/tracking.cc b/test/904-object-allocation/tracking.cc
index c829496..8de350b 100644
--- a/test/904-object-allocation/tracking.cc
+++ b/test/904-object-allocation/tracking.cc
@@ -57,7 +57,7 @@
static_cast<size_t>(size));
}
-extern "C" JNIEXPORT void JNICALL Java_Main_setupObjectAllocCallback(
+extern "C" JNIEXPORT void JNICALL Java_art_Test904_setupObjectAllocCallback(
JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jboolean enable) {
jvmtiEventCallbacks callbacks;
memset(&callbacks, 0, sizeof(jvmtiEventCallbacks));
@@ -67,10 +67,8 @@
JvmtiErrorToException(env, jvmti_env, ret);
}
-extern "C" JNIEXPORT void JNICALL Java_Main_enableAllocationTracking(JNIEnv* env,
- jclass,
- jthread thread,
- jboolean enable) {
+extern "C" JNIEXPORT void JNICALL Java_art_Test904_enableAllocationTracking(
+ JNIEnv* env, jclass, jthread thread, jboolean enable) {
jvmtiError ret = jvmti_env->SetEventNotificationMode(
enable ? JVMTI_ENABLE : JVMTI_DISABLE,
JVMTI_EVENT_VM_OBJECT_ALLOC,