diff options
| -rwxr-xr-x | test/etc/run-test-jar | 44 | ||||
| -rwxr-xr-x | test/run-test | 2 |
2 files changed, 23 insertions, 23 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 8245947251..4794f6b7c1 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -322,6 +322,28 @@ if [ "$DEBUGGER" = "y" ]; then DEBUGGER_OPTS="-agentlib:jdwp=transport=dt_socket,address=$PORT,server=y,suspend=y" fi +if [ "$IS_JVMTI_TEST" = "y" ]; then + plugin=libopenjdkjvmtid.so + agent=libtiagentd.so + lib=tiagentd + if [[ "$TEST_IS_NDEBUG" = "y" ]]; then + agent=libtiagent.so + plugin=libopenjdkjvmti.so + lib=tiagent + fi + + ARGS="${ARGS} ${lib}" + if [[ "$USE_JVM" = "y" ]]; then + FLAGS="${FLAGS} -agentpath:${ANDROID_HOST_OUT}/nativetest64/${agent}=${TEST_NAME},jvm" + else + FLAGS="${FLAGS} -agentpath:${agent}=${TEST_NAME},art" + FLAGS="${FLAGS} -Xplugin:${plugin}" + FLAGS="${FLAGS} -Xfully-deoptable" + # Always make the compilation be debuggable. + COMPILE_FLAGS="${COMPILE_FLAGS} --debuggable" + fi +fi + if [ "$USE_JVM" = "y" ]; then export LD_LIBRARY_PATH=${ANDROID_HOST_OUT}/lib64 # Xmx is necessary since we don't pass down the ART flags to JVM. @@ -387,28 +409,6 @@ if [ "$JIT" = "y" ]; then fi fi -if [ "$IS_JVMTI_TEST" = "y" ]; then - plugin=libopenjdkjvmtid.so - agent=libtiagentd.so - lib=tiagentd - if [[ "$TEST_IS_NDEBUG" = "y" ]]; then - agent=libtiagent.so - plugin=libopenjdkjvmti.so - lib=tiagent - fi - - ARGS="${ARGS} ${lib}" - if [[ "$USE_JVM" = "y" ]]; then - FLAGS="${FLAGS} -agentpath:${agent}=${TEST_NAME},jvm" - else - FLAGS="${FLAGS} -agentpath:${agent}=${TEST_NAME},art" - FLAGS="${FLAGS} -Xplugin:${plugin}" - FLAGS="${FLAGS} -Xfully-deoptable" - # Always make the compilation be debuggable. - COMPILE_FLAGS="${COMPILE_FLAGS} --debuggable" - fi -fi - JNI_OPTS="-Xjnigreflimit:512 -Xcheck:jni" if [ "$RELOCATE" = "y" ]; then diff --git a/test/run-test b/test/run-test index ea9622aa69..abe73c3159 100755 --- a/test/run-test +++ b/test/run-test @@ -489,7 +489,7 @@ elif [ "$runtime" = "art" ]; then fi elif [ "$runtime" = "jvm" ]; then # TODO: Detect whether the host is 32-bit or 64-bit. - run_args="${run_args} --runtime-option -Djava.library.path=${ANDROID_HOST_OUT}/lib64" + run_args="${run_args} --runtime-option -Djava.library.path=${ANDROID_HOST_OUT}/lib64:${ANDROID_HOST_OUT}/nativetest64" fi if [ "$have_image" = "no" ]; then |