Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e am: fbaae95af6 am: 52644bc496 am: 723b0849ca am: 66ae1a15cb am: a67d6ece41

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640111

Change-Id: Ib9904a3af5a226c50155dc5132784d851137271f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2023-06-28 13:42:04 +00:00
committed by Automerger Merge Worker

View File

@@ -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()) {