diff options
| author | 2023-06-28 09:43:50 +0000 | |
|---|---|---|
| committer | 2023-06-28 09:43:50 +0000 | |
| commit | fbaae95af61ed2b3a4cd4e48bfec6939a1d5e996 (patch) | |
| tree | c749219a7d593a4cde4e2118c931116212648dba | |
| parent | 70fcc6b94164b1d7c2bda05ff0d262dd29da0427 (diff) | |
| parent | 79572ee42e6a57b9e5deede5a3317d3244f866b6 (diff) | |
Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640111
Change-Id: I01a5ae4dbc5ed66130b01a8352ed8dffce7d2995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java index 3910a0827aad..7712aeef4161 100644 --- a/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java +++ b/apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java @@ -52,7 +52,7 @@ public class ExpensiveObjectsPerfTest { } } - @Test(timeout = 900) + @Test(timeout = 900000) public void timeClonedDateFormatTimeInstance() { DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT); BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); @@ -72,7 +72,7 @@ public class ExpensiveObjectsPerfTest { } } - @Test + @Test(timeout = 900000) public void timeNewCollator() { BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); while (state.keepRunning()) { |