Merge "Extend ExpensiveObjectsPerfTest timeouts."

2023-06-28 09:04:15 +00:00
parent 03626acc2d 9e46feadb2
commit 79572ee42e
1 changed files with 2 additions and 2 deletions
--- 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()) {