diff options
| author | 2017-06-15 12:40:48 +0000 | |
|---|---|---|
| committer | 2017-06-15 12:40:51 +0000 | |
| commit | c51d94b2c9322197b2691765a05a979b500f2317 (patch) | |
| tree | 744e78fe8dd85cb1ad84bcd1f3d7bf2df5e36173 | |
| parent | fbc3fffc4a01a22a5e48c5f834e7334ea781e588 (diff) | |
| parent | 622e2e297351ba9f8a7f80090e4985fbc3633512 (diff) | |
Merge "Create an expectation file for gcstress/debug."
| -rw-r--r-- | tools/libcore_failures.txt | 2 | ||||
| -rw-r--r-- | tools/libcore_gcstress_debug_failures.txt | 16 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 12 |
3 files changed, 29 insertions, 1 deletions
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt index 0c58585701..f340fa1d25 100644 --- a/tools/libcore_failures.txt +++ b/tools/libcore_failures.txt @@ -1,6 +1,6 @@ /* * This file contains expectations for ART's buildbot. The purpose of this file is - * to temporary and quickly list failing tests and not break the bots, until the + * to temporarily list failing tests and not break the bots, until the * libcore expectation files get properly updated. The script that uses this file * is art/tools/run-libcore-tests.sh. * diff --git a/tools/libcore_gcstress_debug_failures.txt b/tools/libcore_gcstress_debug_failures.txt new file mode 100644 index 0000000000..b4c6f2bda9 --- /dev/null +++ b/tools/libcore_gcstress_debug_failures.txt @@ -0,0 +1,16 @@ +/* + * This file contains expectations for ART's buildbot when running gcstress in debug mode. + * The script that uses this file is art/tools/run-libcore-tests.sh. + */ + +[ +{ + description: "Timeouts on target with gcstress and debug.", + result: EXEC_FAILED, + modes: [device], + names: ["libcore.icu.TransliteratorTest#testAll", + "libcore.java.lang.ref.ReferenceQueueTest#testRemoveWithDelayedResultAndTimeout", + "libcore.java.util.TimeZoneTest#testSetDefaultDeadlock", + "org.apache.harmony.tests.java.util.TimerTest#testThrowingTaskKillsTimerThread"] +} +] diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index f9f375457b..8b3df3a28c 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -103,6 +103,9 @@ working_packages=("dalvik.system" # "org.apache.harmony.security" vogar_args=$@ +gcstress=false +debug=false + while true; do if [[ "$1" == "--mode=device" ]]; then vogar_args="$vogar_args --device-dir=/data/local/tmp" @@ -125,6 +128,10 @@ while true; do # Remove the --debug from the arguments. vogar_args=${vogar_args/$1} vogar_args="$vogar_args --vm-arg -XXlib:libartd.so" + debug=true + shift + elif [[ "$1" == "-Xgc:gcstress" ]]; then + gcstress=true shift elif [[ "$1" == "" ]]; then break @@ -151,6 +158,11 @@ if $use_jit; then fi vogar_args="$vogar_args --vm-arg -Xusejit:$use_jit" +# gcstress and debug may lead to timeouts, so we need a dedicated expectations file for it. +if [[ $gcstress && $debug ]]; then + expectations="$expectations --expectations art/tools/libcore_gcstress_debug_failures.txt" +fi + # Run the tests using vogar. echo "Running tests for the following test packages:" echo ${working_packages[@]} | tr " " "\n" |