diff options
| author | 2019-01-09 09:36:03 +0000 | |
|---|---|---|
| committer | 2019-01-09 09:37:22 +0000 | |
| commit | 191cae33c7c24eabb8edb90b6a577a5dc466ff27 (patch) | |
| tree | 5c3da7ea834865d7eae9432d755d8daec1dfc97e | |
| parent | 2fb49ebea175b7ec047da6944eede43317df8686 (diff) | |
Use *-testdex in libcore and jdwp testing.
These scripts are only used in a buildbot context, which only builds
the *-testdex jars.
Test: run-libcore-tests, run-jdwp-tests
Change-Id: Iea66e40c245170a4ecbafe711d23dec4e0506f0e
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 5 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index c7503bbd1b..ac9f09aa2d 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -125,6 +125,11 @@ while true; do # Vogar knows which VM to use on host. vm_command="" shift + elif [[ "$1" == "--mode=device" ]]; then + # Remove the --mode=device from the arguments and replace it with --mode=device_testdex + args=${args/$1} + args="$args --mode=device_testdex" + shift elif [[ "$1" == "--mode=jvm" ]]; then mode="ri" make_target_name="apache-harmony-jdwp-tests-host" diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 68c4fd8563..ea7464ffed 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -125,6 +125,9 @@ device_mode=false while true; do if [[ "$1" == "--mode=device" ]]; then device_mode=true + # Remove the --mode=device from the arguments and replace it with --mode=device_testdex + vogar_args=${vogar_args/$1} + vogar_args="$vogar_args --mode=device_testdex" vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core.art" vogar_args="$vogar_args $(boot_classpath_arg /system/framework -testdex $BOOT_CLASSPATH_JARS)" shift |