Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e am: fbaae95af6

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

Change-Id: I06f4f2022cc536eaaf4c166f14980fc86cd213b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2023-06-28 10:19:47 +00:00
committed by Automerger Merge Worker
parent ef780ed929 fbaae95af6
commit 52644bc496
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
View File

@@ -52,7 +52,7 @@ public class ExpensiveObjectsPerfTest {
} }
} }
@Test(timeout = 900) @Test(timeout = 900000)
public void timeClonedDateFormatTimeInstance() { public void timeClonedDateFormatTimeInstance() {
DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT); DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
@@ -72,7 +72,7 @@ public class ExpensiveObjectsPerfTest {
} }
} }
@Test @Test(timeout = 900000)
public void timeNewCollator() { public void timeNewCollator() {
BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) { while (state.keepRunning()) {