commit 4665167ddc34008dfa78a2873685fe7a98772eab
author Andreas Gampe <agampe@google.com> Fri Apr 07 09:00:04 2017 -0700
committer Andreas Gampe <agampe@google.com> Fri Apr 07 09:44:55 2017 -0700
tree 9af21169db0e6de2496b2946861436a9ecaf72e3
parent 2bbf16da51c6a61da8ccd3c8d4d8382f6bbc9623

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

test/911-get-stack-trace/stack_trace.cc

diff --git a/test/911-get-stack-trace/stack_trace.cc b/test/911-get-stack-trace/stack_trace.cc
index a499e90..985120c 100644
--- a/test/911-get-stack-trace/stack_trace.cc
+++ b/test/911-get-stack-trace/stack_trace.cc
@@ -37,14 +37,6 @@
 
 using android::base::StringPrintf;
 
-extern "C" JNIEXPORT void JNICALL Java_Main_bindTest911Classes(
-    JNIEnv* env, jclass klass ATTRIBUTE_UNUSED) {
-  BindFunctions(jvmti_env, env, "AllTraces");
-  BindFunctions(jvmti_env, env, "Frames");
-  BindFunctions(jvmti_env, env, "PrintThread");
-  BindFunctions(jvmti_env, env, "ThreadListTraces");
-}
-
 static jint FindLineNumber(jint line_number_count,
                            jvmtiLineNumberEntry* line_number_table,
                            jlocation location) {
@@ -132,7 +124,7 @@
   return CreateObjectArray(env, count, "[Ljava/lang/String;", callback);
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_PrintThread_getStackTrace(
+extern "C" JNIEXPORT jobjectArray JNICALL Java_art_PrintThread_getStackTrace(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jthread thread, jint start, jint max) {
   std::unique_ptr<jvmtiFrameInfo[]> frames(new jvmtiFrameInfo[max]);
 
@@ -147,7 +139,7 @@
   return TranslateJvmtiFrameInfoArray(env, frames.get(), count);
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_AllTraces_getAllStackTraces(
+extern "C" JNIEXPORT jobjectArray JNICALL Java_art_AllTraces_getAllStackTraces(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jint max) {
   jint thread_count;
   jvmtiStackInfo* stack_infos;
@@ -175,7 +167,7 @@
   return ret;
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_ThreadListTraces_getThreadListStackTraces(
+extern "C" JNIEXPORT jobjectArray JNICALL Java_art_ThreadListTraces_getThreadListStackTraces(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jobjectArray jthreads, jint max) {
   jint thread_count = env->GetArrayLength(jthreads);
   std::unique_ptr<jthread[]> threads(new jthread[thread_count]);
@@ -211,7 +203,7 @@
   return ret;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_Frames_getFrameCount(
+extern "C" JNIEXPORT jint JNICALL Java_art_Frames_getFrameCount(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jthread thread) {
   jint count;
   jvmtiError result = jvmti_env->GetFrameCount(thread, &count);
@@ -221,7 +213,7 @@
   return count;
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_Frames_getFrameLocation(
+extern "C" JNIEXPORT jobjectArray JNICALL Java_art_Frames_getFrameLocation(
     JNIEnv* env, jclass klass ATTRIBUTE_UNUSED, jthread thread, jint depth) {
   jmethodID method;
   jlocation location;