Make no-relocate the default.
With the move to not support relocatable oat files, testing "relocate"
does not make sense anymore (the runtime would just discard the prebuild
oat file and generate a new one in dalvik-cache).
Just make no-relocate the default for now. We can remove relocation types
once Richard is done removing relocation.
Test: test-art-host test-art-target
bug:33192586
Change-Id: If39a0ad63451c68d4cfbbb26b767ad98b97d208e
diff --git a/test/run-test b/test/run-test
index a228789..feb6e42 100755
--- a/test/run-test
+++ b/test/run-test
@@ -111,7 +111,7 @@
dev_mode="no"
update_mode="no"
debug_mode="no"
-relocate="yes"
+relocate="no"
runtime="art"
usage="no"
build_only="no"
@@ -626,8 +626,8 @@
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."