diff options
| author | Pete Gillin <peteg@google.com> | 2017-08-09 14:18:54 +0100 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2017-09-26 16:41:53 +0100 |
| commit | 6f1b7aa67c34422bb29fc9f1c06b95234cc197a3 (patch) | |
| tree | 69c2d22278310d0feb22361f152702a3181260eb /android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java | |
| parent | 039d984ce64ce860460176794e3163312a2b722f (diff) | |
| download | icu-6f1b7aa67c34422bb29fc9f1c06b95234cc197a3.tar.gz | |
Add sharding annotations to android_icu4j test classes.
Some tests were using too much heap, causing excessive garbage
collection and subsequent timeouts. This change adds an annotation
those specifically, so that they can be run in a separate process,
using their own heaps, so avoiding the timeouts.
Some of these tests were suppressed in the past. The suppressions were
undone when ICU 59 landed, which most likely caused problems on
low-memory devices (b/62374714, whose fix was reverted when ICU 59
landed, and perhaps b/37642683). This change (along with the
AndroidTest.xml change to actually apply the sharding) fixes those
problems. This was tested on fugu on an oc build.
Cherry-pick notes: changes under android_icu4j were regenerated by running
tools/srcgen/generate_android_icu4j.sh.
Bug: 62512577
Test: cts-tradefed run cts -m CtsIcuTestCases --primary-abi-only
Change-Id: I013ea26728120bbe3238a7a2dd165606ccad243d
(cherry picked from commit 2e13a2bdade5cd0a635f0bd89805931a6fd710da)
Diffstat (limited to 'android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java index 23e4f968f..877c4ef5b 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IndianTest.java @@ -22,10 +22,12 @@ import android.icu.util.GregorianCalendar; import android.icu.util.IndianCalendar; import android.icu.util.TimeZone; import android.icu.util.ULocale; +import android.icu.testsharding.MainTestShard; /** * Tests for the <code>IndianCalendar</code> class. */ +@MainTestShard public class IndianTest extends CalendarTestFmwk { // Months in indian calendar are 0-based. Here taking 1-based names: |