run-test: Fix --dev

The internal script's argument was renamed to --verbose

Test: ./art/test/run-test --host --dev 001-HelloWorld
Change-Id: Ie031d75f189a7a3b5c83fe6b2e0532b2d4486ace
diff --git a/test/run-test b/test/run-test
index 02f84ef..90deb50 100755
--- a/test/run-test
+++ b/test/run-test
@@ -345,7 +345,7 @@
         create_runner="yes"
         shift()
     elif arg == "--dev":
-        run_args+=['--dev']
+        run_args+=['--verbose']
         dev_mode="yes"
         shift()
     elif arg == "--temp-path":
@@ -662,114 +662,114 @@
 if usage == "yes":
     prog=os.path.basename(__file__)
     help=(
-        "usage:"
-        f"  $prog --help                          Print this message."
-        f"  $prog [options] [test-name]           Run test normally."
-        f"  $prog --dev [options] [test-name]     Development mode"
-        "(dumps to stdout)."
-        f"  $prog --create-runner [options] [test-name]"
-        "              Creates a runner script for use with other "
-        "tools (e.g. parallel_run.py)."
-        "              The script will only run the test portion, and "
-        "share oat and dex files."
-        f"  $prog --update [options] [test-name]  Update mode"
-        "(replaces expected-stdout.txt and expected-stderr.txt)."
-        '  Omitting the test name or specifying "-" will use the'
-        "current directory."
-        "  Runtime Options:"
-        "    -O                    Run non-debug rather than debug build (off by default)."
-        "    -Xcompiler-option     Pass an option to the compiler."
-        "    --runtime-option      Pass an option to the runtime."
-        "    --compact-dex-level   Specify a compact dex level to the compiler."
-        "    --debug               Wait for the default debugger to attach."
-        "    --debug-agent <agent-path>"
-        "                          Wait for the given debugger agent to attach. Currently"
-        "                          only supported on host."
-        "    --debug-wrap-agent    use libwrapagentproperties and tools/libjdwp-compat.props"
-        "                          to load the debugger agent specified by --debug-agent."
-        "    --with-agent <agent>  Run the test with the given agent loaded with -agentpath:"
-        "    --debuggable          Whether to compile Java code for a debugger."
-        "    --gdb                 Run under gdb; incompatible with some tests."
-        "    --gdb-dex2oat         Run dex2oat under the prebuilt lldb."
-        "    --gdbserver           Start gdbserver (defaults to port :5039)."
-        "    --gdbserver-port <port>"
-        "                          Start gdbserver with the given COMM (see man gdbserver)."
-        "    --gdbserver-bin <binary>"
-        "                          Use the given binary as gdbserver."
-        "    --gdb-arg             Pass an option to gdb or gdbserver."
-        "    --gdb-dex2oat-args    Pass options separated by ';' to lldb for dex2oat."
-        "    --simpleperf          Wraps the dalvikvm invocation in 'simpleperf record ..."
-        "                          ... simpleperf report' and dumps stats to stdout."
-        "    --temp-path [path]    Location where to execute the tests."
-        "    --interpreter         Enable interpreter only mode (off by default)."
-        "    --jit                 Enable jit (off by default)."
-        "    --optimizing          Enable optimizing compiler (default)."
-        "    --no-verify           Turn off verification (on by default)."
-        "    --verify-soft-fail    Force soft fail verification (off by default)."
-        "                          Verification is enabled if neither --no-verify"
-        "                          nor --verify-soft-fail is specified."
-        "    --no-optimize         Turn off optimization (on by default)."
-        "    --no-precise          Turn off precise GC (on by default)."
-        "    --zygote              Spawn the process from the Zygote."
-        "If used, then the"
-        "                          other runtime options are ignored."
-        "    --prebuild            Run dex2oat on the files before starting test. (default)"
-        "    --no-prebuild         Do not run dex2oat on the files before starting"
-        "                          the test."
-        "    --strip-dex           Strip the dex files before starting test."
-        "    --relocate            Force the use of relocating in the test, making"
-        "                          the image and oat files be relocated to a random"
-        "                          address before running."
-        "    --no-relocate         Force the use of no relocating in the test. (default)"
-        "    --image               Run the test using a precompiled boot image. (default)"
-        "    --no-image            Run the test without a precompiled boot image."
-        "    --host                Use the host-mode virtual machine."
-        "    --invoke-with         Pass --invoke-with option to runtime."
-        "    --dalvik              Use Dalvik (off by default)."
-        "    --jvm                 Use a host-local RI virtual machine."
-        "    --use-java-home       Use the JAVA_HOME environment variable"
-        "                          to find the java compiler and runtime"
-        "                          (if applicable) to run the test with."
-        "    --64                  Run the test in 64-bit mode"
-        "    --bionic              Use the (host, 64-bit only) linux_bionic libc runtime"
-        "    --runtime-zipapex [file]"
-        "                          Use the given zipapex file to provide runtime binaries"
-        "    --runtime-extracted-zipapex [dir]"
-        "                          Use the given extracted zipapex directory to provide"
-        "                          runtime binaries"
-        "    --timeout n           Test timeout in seconds"
-        "    --trace               Run with method tracing"
-        "    --strace              Run with syscall tracing from strace."
-        "    --stream              Run method tracing in streaming mode (requires --trace)"
-        "    --gcstress            Run with gc stress testing"
-        "    --gcverify            Run with gc verification"
-        "    --jvmti-trace-stress  Run with jvmti method tracing stress testing"
-        "    --jvmti-step-stress   Run with jvmti single step stress testing"
-        "    --jvmti-redefine-stress"
-        "                          Run with jvmti method redefinition stress testing"
-        "    --always-clean        Delete the test files even if the test fails."
-        "    --never-clean         Keep the test files even if the test succeeds."
-        "    --chroot [newroot]    Run with root directory set to newroot."
-        "    --android-root [path] The path on target for the android root. (/system by default)."
-        "    --android-i18n-root [path]"
-        "                          The path on target for the i18n module root."
-        "                          (/apex/com.android.i18n by default)."
-        "    --android-art-root [path]"
-        "                          The path on target for the ART module root."
-        "                          (/apex/com.android.art by default)."
-        "    --android-tzdata-root [path]"
-        "                          The path on target for the Android Time Zone Data root."
-        "                          (/apex/com.android.tzdata by default)."
-        "    --dex2oat-swap        Use a dex2oat swap file."
-        "    --instruction-set-features [string]"
-        "                          Set instruction-set-features for compilation."
-        "    --quiet               Don't print anything except failure messages"
-        "    --external-log-tags   Use ANDROID_LOG_TAGS to set a custom logging level for"
-        "                          a test run."
-        "    --bisection-search    Perform bisection bug search."
-        "    --vdex                Test using vdex as in input to dex2oat. Only works with --prebuild."
-        "    --suspend-timeout     Change thread suspend timeout ms (default 500000)."
-        "    --dex2oat-jobs        Number of dex2oat jobs."
+        "usage:\n"
+        f"  $prog --help                          Print this message.\n"
+        f"  $prog [options] [test-name]           Run test normally.\n"
+        f"  $prog --dev [options] [test-name]     Development mode\n"
+        "(dumps to stdout).\n"
+        f"  $prog --create-runner [options] [test-name]\n"
+        "              Creates a runner script for use with other \n"
+        "tools (e.g. parallel_run.py).\n"
+        "              The script will only run the test portion, and \n"
+        "share oat and dex files.\n"
+        f"  $prog --update [options] [test-name]  Update mode\n"
+        "(replaces expected-stdout.txt and expected-stderr.txt).\n"
+        '  Omitting the test name or specifying "-" will use the\n'
+        "current directory.\n"
+        "  Runtime Options:\n"
+        "    -O                    Run non-debug rather than debug build (off by default).\n"
+        "    -Xcompiler-option     Pass an option to the compiler.\n"
+        "    --runtime-option      Pass an option to the runtime.\n"
+        "    --compact-dex-level   Specify a compact dex level to the compiler.\n"
+        "    --debug               Wait for the default debugger to attach.\n"
+        "    --debug-agent <agent-path>\n"
+        "                          Wait for the given debugger agent to attach. Currently\n"
+        "                          only supported on host.\n"
+        "    --debug-wrap-agent    use libwrapagentproperties and tools/libjdwp-compat.props\n"
+        "                          to load the debugger agent specified by --debug-agent.\n"
+        "    --with-agent <agent>  Run the test with the given agent loaded with -agentpath:\n"
+        "    --debuggable          Whether to compile Java code for a debugger.\n"
+        "    --gdb                 Run under gdb; incompatible with some tests.\n"
+        "    --gdb-dex2oat         Run dex2oat under the prebuilt lldb.\n"
+        "    --gdbserver           Start gdbserver (defaults to port :5039).\n"
+        "    --gdbserver-port <port>\n"
+        "                          Start gdbserver with the given COMM (see man gdbserver).\n"
+        "    --gdbserver-bin <binary>\n"
+        "                          Use the given binary as gdbserver.\n"
+        "    --gdb-arg             Pass an option to gdb or gdbserver.\n"
+        "    --gdb-dex2oat-args    Pass options separated by ';' to lldb for dex2oat.\n"
+        "    --simpleperf          Wraps the dalvikvm invocation in 'simpleperf record ...\n"
+        "                          ... simpleperf report' and dumps stats to stdout.\n"
+        "    --temp-path [path]    Location where to execute the tests.\n"
+        "    --interpreter         Enable interpreter only mode (off by default).\n"
+        "    --jit                 Enable jit (off by default).\n"
+        "    --optimizing          Enable optimizing compiler (default).\n"
+        "    --no-verify           Turn off verification (on by default).\n"
+        "    --verify-soft-fail    Force soft fail verification (off by default).\n"
+        "                          Verification is enabled if neither --no-verify\n"
+        "                          nor --verify-soft-fail is specified.\n"
+        "    --no-optimize         Turn off optimization (on by default).\n"
+        "    --no-precise          Turn off precise GC (on by default).\n"
+        "    --zygote              Spawn the process from the Zygote.\n"
+        "If used, then the\n"
+        "                          other runtime options are ignored.\n"
+        "    --prebuild            Run dex2oat on the files before starting test. (default)\n"
+        "    --no-prebuild         Do not run dex2oat on the files before starting\n"
+        "                          the test.\n"
+        "    --strip-dex           Strip the dex files before starting test.\n"
+        "    --relocate            Force the use of relocating in the test, making\n"
+        "                          the image and oat files be relocated to a random\n"
+        "                          address before running.\n"
+        "    --no-relocate         Force the use of no relocating in the test. (default)\n"
+        "    --image               Run the test using a precompiled boot image. (default)\n"
+        "    --no-image            Run the test without a precompiled boot image.\n"
+        "    --host                Use the host-mode virtual machine.\n"
+        "    --invoke-with         Pass --invoke-with option to runtime.\n"
+        "    --dalvik              Use Dalvik (off by default).\n"
+        "    --jvm                 Use a host-local RI virtual machine.\n"
+        "    --use-java-home       Use the JAVA_HOME environment variable\n"
+        "                          to find the java compiler and runtime\n"
+        "                          (if applicable) to run the test with.\n"
+        "    --64                  Run the test in 64-bit mode\n"
+        "    --bionic              Use the (host, 64-bit only) linux_bionic libc runtime\n"
+        "    --runtime-zipapex [file]\n"
+        "                          Use the given zipapex file to provide runtime binaries\n"
+        "    --runtime-extracted-zipapex [dir]\n"
+        "                          Use the given extracted zipapex directory to provide\n"
+        "                          runtime binaries\n"
+        "    --timeout n           Test timeout in seconds\n"
+        "    --trace               Run with method tracing\n"
+        "    --strace              Run with syscall tracing from strace.\n"
+        "    --stream              Run method tracing in streaming mode (requires --trace)\n"
+        "    --gcstress            Run with gc stress testing\n"
+        "    --gcverify            Run with gc verification\n"
+        "    --jvmti-trace-stress  Run with jvmti method tracing stress testing\n"
+        "    --jvmti-step-stress   Run with jvmti single step stress testing\n"
+        "    --jvmti-redefine-stress\n"
+        "                          Run with jvmti method redefinition stress testing\n"
+        "    --always-clean        Delete the test files even if the test fails.\n"
+        "    --never-clean         Keep the test files even if the test succeeds.\n"
+        "    --chroot [newroot]    Run with root directory set to newroot.\n"
+        "    --android-root [path] The path on target for the android root. (/system by default).\n"
+        "    --android-i18n-root [path]\n"
+        "                          The path on target for the i18n module root.\n"
+        "                          (/apex/com.android.i18n by default).\n"
+        "    --android-art-root [path]\n"
+        "                          The path on target for the ART module root.\n"
+        "                          (/apex/com.android.art by default).\n"
+        "    --android-tzdata-root [path]\n"
+        "                          The path on target for the Android Time Zone Data root.\n"
+        "                          (/apex/com.android.tzdata by default).\n"
+        "    --dex2oat-swap        Use a dex2oat swap file.\n"
+        "    --instruction-set-features [string]\n"
+        "                          Set instruction-set-features for compilation.\n"
+        "    --quiet               Don't print anything except failure messages\n"
+        "    --external-log-tags   Use ANDROID_LOG_TAGS to set a custom logging level for\n"
+        "                          a test run.\n"
+        "    --bisection-search    Perform bisection bug search.\n"
+        "    --vdex                Test using vdex as in input to dex2oat. Only works with --prebuild.\n"
+        "    --suspend-timeout     Change thread suspend timeout ms (default 500000).\n"
+        "    --dex2oat-jobs        Number of dex2oat jobs.\n"
     )
     error(help)
     sys.exit(1)