diff options
| author | 2018-08-06 09:28:20 +0100 | |
|---|---|---|
| committer | 2018-08-06 09:28:20 +0100 | |
| commit | a353ce5871934fa7d32a00acb4921c58c58e81c5 (patch) | |
| tree | d9a19923697774502104942b6436a67fbc7dd505 | |
| parent | 8e7ddc234ecbde21b0e6755cf66bcad858a817d2 (diff) | |
Adjust gcstress/debug/target timeouts for libcore.
The latest gcstress changes made vogar timeout when setting up tests,
so no test was actuall run.
Test: run-libcore-tests.sh
Change-Id: If36c793aa37941a09934f92b285db86bb3709940
| -rw-r--r-- | tools/libcore_gcstress_debug_failures.txt | 2 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/libcore_gcstress_debug_failures.txt b/tools/libcore_gcstress_debug_failures.txt index f0e4932c30..942a4e0fc6 100644 --- a/tools/libcore_gcstress_debug_failures.txt +++ b/tools/libcore_gcstress_debug_failures.txt @@ -9,12 +9,14 @@ result: EXEC_FAILED, modes: [device], names: ["jsr166.CompletableFutureTest#testCompleteOnTimeout_completed", + "jsr166.CompletableFutureTest#testDelayedExecutor", "libcore.libcore.icu.TransliteratorTest#testAll", "libcore.libcore.icu.RelativeDateTimeFormatterTest#test_bug25821045", "libcore.libcore.icu.RelativeDateTimeFormatterTest#test_bug25883157", "libcore.java.lang.ref.ReferenceQueueTest#testRemoveWithDelayedResultAndTimeout", "libcore.java.util.TimeZoneTest#testSetDefaultDeadlock", "libcore.javax.crypto.CipherBasicsTest#testBasicEncryption", + "org.apache.harmony.tests.java.text.MessageFormatTest#test_parseLjava_lang_String", "org.apache.harmony.tests.java.util.TimerTest#testThrowingTaskKillsTimerThread"] }, { diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index aff009abb6..240d63c6d3 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -156,7 +156,11 @@ fi # Increase the timeout, as vogar cannot set individual test # timeout when being asked to run packages, and some tests go above # the default timeout. -vogar_args="$vogar_args --timeout 480" +if $gcstress && $debug && $device_mode; then + vogar_args="$vogar_args --timeout 960" +else + vogar_args="$vogar_args --timeout 480" +fi # set the toolchain to use. vogar_args="$vogar_args --toolchain d8 --language CUR" |