diff options
| -rw-r--r-- | build/Android.common_test.mk | 4 | ||||
| -rw-r--r-- | test/552-checker-sharpening/src/Main.java | 4 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 6 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 2 | ||||
| -rwxr-xr-x | test/run-test | 6 |
5 files changed, 9 insertions, 13 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 291db8b531..f335cc3b9f 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -87,8 +87,8 @@ ART_TEST_GC_STRESS ?= $(ART_TEST_FULL) # Do you want tests with the JNI forcecopy mode enabled run? ART_TEST_JNI_FORCECOPY ?= $(ART_TEST_FULL) -# Do you want run-tests with relocation disabled run? -ART_TEST_RUN_TEST_NO_RELOCATE ?= $(ART_TEST_FULL) +# Do you want run-tests with relocation enabled run? +ART_TEST_RUN_TEST_RELOCATE ?= $(ART_TEST_FULL) # Do you want run-tests with prebuilding? ART_TEST_RUN_TEST_PREBUILD ?= true diff --git a/test/552-checker-sharpening/src/Main.java b/test/552-checker-sharpening/src/Main.java index db437686f0..a46a23c95c 100644 --- a/test/552-checker-sharpening/src/Main.java +++ b/test/552-checker-sharpening/src/Main.java @@ -381,10 +381,6 @@ public class Main { /// CHECK-START-ARM: java.lang.Class Main.$noinline$getOtherClass() sharpening (after) /// CHECK: LoadClass load_kind:BssEntry class_name:Other - /// CHECK-START-ARM: java.lang.Class Main.$noinline$getOtherClass() dex_cache_array_fixups_arm (after) - /// CHECK-DAG: ArmDexCacheArraysBase - /// CHECK-DAG: LoadClass load_kind:BssEntry class_name:Other - /// CHECK-START-ARM64: java.lang.Class Main.$noinline$getOtherClass() sharpening (after) /// CHECK: LoadClass load_kind:BssEntry class_name:Other diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index cb798f049d..425275345a 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -136,9 +136,9 @@ ifeq ($(ART_TEST_OPTIMIZING_GRAPH_COLOR),true) COMPILER_TYPES += regalloc_gc OPTIMIZING_COMPILER_TYPES += regalloc_gc endif -RELOCATE_TYPES := relocate -ifeq ($(ART_TEST_RUN_TEST_NO_RELOCATE),true) - RELOCATE_TYPES += no-relocate +RELOCATE_TYPES := no-relocate +ifeq ($(ART_TEST_RUN_TEST_RELOCATE),true) + RELOCATE_TYPES += relocate endif ifeq ($(ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT),true) RELOCATE_TYPES += relocate-npatchoat diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 28fa130443..774f398041 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -39,7 +39,7 @@ OPTIMIZE="y" PATCHOAT="" PREBUILD="y" QUIET="n" -RELOCATE="y" +RELOCATE="n" STRIP_DEX="n" SECONDARY_DEX="" TIME_OUT="gdb" # "n" (disabled), "timeout" (use timeout), "gdb" (use gdb) diff --git a/test/run-test b/test/run-test index a228789701..feb6e42567 100755 --- a/test/run-test +++ b/test/run-test @@ -111,7 +111,7 @@ target_mode="yes" dev_mode="no" update_mode="no" debug_mode="no" -relocate="yes" +relocate="no" runtime="art" usage="no" build_only="no" @@ -626,8 +626,8 @@ if [ "$usage" = "yes" ]; then echo " --strip-dex Strip the dex files before starting test." echo " --relocate Force the use of relocating in the test, making" echo " the image and oat files be relocated to a random" - echo " address before running. (default)" - echo " --no-relocate Force the use of no relocating in the test" + echo " address before running." + echo " --no-relocate Force the use of no relocating in the test. (default)" echo " --image Run the test using a precompiled boot image. (default)" echo " --no-image Run the test without a precompiled boot image." echo " --host Use the host-mode virtual machine." |