diff options
| author | 2018-05-02 13:23:37 +0000 | |
|---|---|---|
| committer | 2018-05-02 13:23:37 +0000 | |
| commit | a36cbaaad9de58bda29bc74bde0dbb4ed389f4cc (patch) | |
| tree | 3f8ba2a15934acfe57ee213ec74ba68d4d78842c | |
| parent | b0be495b8678b95e95651cf55cb417934b12ee08 (diff) | |
| parent | a655575c393f88219fa559d3d2e71ad905675621 (diff) | |
Merge "Don't run ICU tests on gcstress."
| -rwxr-xr-x | tools/run-libcore-tests.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 7f0383d55d..26b5c0a09b 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -77,7 +77,6 @@ working_packages=("libcore.dalvik.system" "libcore.javax.security" "libcore.javax.sql" "libcore.javax.xml" - "libcore.libcore.icu" "libcore.libcore.io" "libcore.libcore.net" "libcore.libcore.reflect" @@ -154,11 +153,14 @@ fi vogar_args="$vogar_args --vm-arg -Xusejit:$use_jit" # gcstress may lead to timeouts, so we need dedicated expectations files for it. -if [[ $gcstress ]]; then +if $gcstress; then expectations="$expectations --expectations art/tools/libcore_gcstress_failures.txt" - if [[ $debug ]]; then + if $debug; then expectations="$expectations --expectations art/tools/libcore_gcstress_debug_failures.txt" fi +else + # We only run this package when not under gcstress as it can cause timeouts. See b/78228743. + working_packages+=("libcore.libcore.icu") fi # Disable network-related libcore tests that are failing on the following |