diff options
| author | 2024-10-29 15:58:20 +0000 | |
|---|---|---|
| committer | 2024-10-29 15:58:20 +0000 | |
| commit | 2e175b7c8fd53a4f8a3896e063cebc5002f98a8b (patch) | |
| tree | c2f816e3cea65f19ae68303a7c9f8e99206c0a0b | |
| parent | 02bd7c0513144f92c147e84170994bf54bd356d8 (diff) | |
| parent | bda2c1fb4476c438905fc641c4400b7e40ca675c (diff) | |
Merge "Revert "Temporarily disable Conscrypt perf tests"" into main am: bda2c1fb44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324434
Change-Id: Ib396a8c5b5f284332d0bd12ba0cd97e0ba0e2c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java | 2 | ||||
| -rw-r--r-- | apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java index 3577fcdf04d6..f20b1706129b 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java @@ -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(); diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java index ac5710047db9..af3c405eab82 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java @@ -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); |