Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbaae95a authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee4 

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



Change-Id: I01a5ae4dbc5ed66130b01a8352ed8dffce7d2995
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70fcc6b9 79572ee4

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

+2 −2
Original line number Diff line number Diff line
@@ -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()) {