diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libcore_failures.txt | 7 | ||||
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 10 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 7 | ||||
| -rwxr-xr-x | tools/setup-buildbot-device.sh | 7 |
4 files changed, 19 insertions, 12 deletions
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt index 81ea79a6e2..9a8b462740 100644 --- a/tools/libcore_failures.txt +++ b/tools/libcore_failures.txt @@ -159,13 +159,6 @@ bug: 22786792 }, { - description: "Formatting failures", - result: EXEC_FAILED, - names: ["libcore.java.text.NumberFormatTest#test_currencyFromLocale", - "libcore.java.text.NumberFormatTest#test_currencyWithPatternDigits"], - bug: 25136848 -}, -{ description: "Lack of IPv6 on some buildbot slaves", result: EXEC_FAILED, names: ["libcore.io.OsTest#test_byteBufferPositions_sendto_recvfrom_af_inet6", diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index edec362025..de27a6faaa 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -30,8 +30,6 @@ fi art="/data/local/tmp/system/bin/art" art_debugee="sh /data/local/tmp/system/bin/art" -# We use Quick's image on target because optimizing's image is not compiled debuggable. -image="-Ximage:/data/art-test/core.art" args=$@ debuggee_args="-Xcompiler-option --debuggable" device_dir="--device-dir=/data/local/tmp" @@ -41,6 +39,8 @@ vm_command="--vm-command=$art" image_compiler_option="" debug="no" verbose="no" +image="-Ximage:/data/art-test/core-jit.art" +vm_args="" # By default, we run the whole JDWP test suite. test="org.apache.harmony.jpda.tests.share.AllTests" @@ -88,7 +88,11 @@ while true; do fi done -vm_args="--vm-arg $image" +if [[ "$image" != "" ]]; then + vm_args="--vm-arg $image" +fi +vm_args="$vm_args --vm-arg -Xusejit:true" +debuggee_args="$debuggee_args -Xusejit:true" if [[ $debug == "yes" ]]; then art="$art -d" art_debugee="$art_debugee -d" diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 80f7a3737f..4b5a5ca76d 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -57,7 +57,6 @@ working_packages=("dalvik.system" "org.apache.harmony.luni" "org.apache.harmony.nio" "org.apache.harmony.regex" - "org.apache.harmony.security" "org.apache.harmony.testframework" "org.apache.harmony.tests.java.io" "org.apache.harmony.tests.java.lang" @@ -68,6 +67,10 @@ working_packages=("dalvik.system" "tests.java.lang.String" "jsr166") +# List of packages we could run, but don't have rights to revert +# changes in case of failures. +# "org.apache.harmony.security" + vogar_args=$@ while true; do if [[ "$1" == "--mode=device" ]]; then @@ -102,4 +105,4 @@ vogar_args="$vogar_args --timeout 480" # Run the tests using vogar. echo "Running tests for the following test packages:" echo ${working_packages[@]} | tr " " "\n" -vogar $vogar_args --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]} +vogar $vogar_args --vm-arg -Xusejit:true --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]} diff --git a/tools/setup-buildbot-device.sh b/tools/setup-buildbot-device.sh index 7faf86ed5c..d5b89897e5 100755 --- a/tools/setup-buildbot-device.sh +++ b/tools/setup-buildbot-device.sh @@ -30,3 +30,10 @@ adb shell ifconfig echo -e "${green}List properties${nc}" adb shell getprop + +echo -e "${green}Uptime${nc}" +adb shell uptime + +echo -e "${green}Kill stalled dalvikvm processes${nc}" +processes=$(adb shell "ps" | grep dalvikvm | awk '{print $2}') +for i in $processes; do adb shell kill -9 $i; done |