diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/466-get-live-vreg/get_live_vreg_jni.cc | 2 | ||||
| -rwxr-xr-x | test/909-attach-agent/run | 6 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 1 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/test/466-get-live-vreg/get_live_vreg_jni.cc b/test/466-get-live-vreg/get_live_vreg_jni.cc index d3a033b12a..6cea673b41 100644 --- a/test/466-get-live-vreg/get_live_vreg_jni.cc +++ b/test/466-get-live-vreg/get_live_vreg_jni.cc @@ -47,7 +47,7 @@ class TestVisitor : public StackVisitor { uint32_t value = 0; if (GetCurrentQuickFrame() != nullptr && GetCurrentOatQuickMethodHeader()->IsOptimized() && - !Runtime::Current()->IsDebuggable()) { + !Runtime::Current()->IsJavaDebuggable()) { CHECK_EQ(GetVReg(m, dex_register_of_first_parameter, kIntVReg, &value), false); } else { CHECK(GetVReg(m, dex_register_of_first_parameter, kIntVReg, &value)); diff --git a/test/909-attach-agent/run b/test/909-attach-agent/run index 0664592cd1..4a2eb34a1d 100755 --- a/test/909-attach-agent/run +++ b/test/909-attach-agent/run @@ -22,10 +22,12 @@ if [[ "$@" == *"-O"* ]]; then fi ./default-run "$@" --android-runtime-option -Xplugin:${plugin} \ - --android-runtime-option -Xfully-deoptable \ + --android-runtime-option -Xcompiler-option \ + --android-runtime-option --debuggable \ --args agent:${agent}=909-attach-agent -./default-run "$@" --android-runtime-option -Xfully-deoptable \ +./default-run "$@" --android-runtime-option -Xcompiler-option \ + --android-runtime-option --debuggable \ --args agent:${agent}=909-attach-agent ./default-run "$@" --args agent:${agent}=909-attach-agent diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index e156c650b2..1b4f19509f 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -607,6 +607,7 @@ TEST_ART_BROKEN_OPTIMIZING_MIPS64_RUN_TESTS := TEST_ART_BROKEN_OPTIMIZING_NONDEBUGGABLE_RUN_TESTS := \ 454-get-vreg \ 457-regs \ + 602-deoptimizeable ifneq (,$(filter $(OPTIMIZING_COMPILER_TYPES),$(COMPILER_TYPES))) ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 774f398041..751aa95f50 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -344,7 +344,7 @@ if [ "$IS_JVMTI_TEST" = "y" ]; then else FLAGS="${FLAGS} -agentpath:${agent}=${TEST_NAME},art" FLAGS="${FLAGS} -Xplugin:${plugin}" - FLAGS="${FLAGS} -Xfully-deoptable" + FLAGS="${FLAGS} -Xcompiler-option --debuggable" # Always make the compilation be debuggable. COMPILE_FLAGS="${COMPILE_FLAGS} --debuggable" fi |