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

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

Merge "Revert "Temporarily disable Conscrypt perf tests"" into main am: bda2c1fb am: 2e175b7c 

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



Change-Id: Ife4be2fa7eb0fa3c2680cc470179ee9620f7f6f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8446cf57 2e175b7c

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public final class ClientSocketPerfTest { 
    /**

     * Simple benchmark for the amount of time to send a given number of messages

     */

    // @Test Temporarily disabled

    @Test

    @Parameters(method = "getParams")

    public void time(Config config) throws Exception {

        reset();

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public final class ServerSocketPerfTest { 
        executor.awaitTermination(5, TimeUnit.SECONDS);

    }



    // @Test Temporarily disabled

    @Test

    @Parameters(method = "getParams")

    public void throughput(Config config) throws Exception {

        setup(config);