diff options
| author | 2024-10-29 15:30:13 +0000 | |
|---|---|---|
| committer | 2024-10-29 15:30:13 +0000 | |
| commit | bda2c1fb4476c438905fc641c4400b7e40ca675c (patch) | |
| tree | 90f1a0504e75693cad0dc732f007181a498d9945 | |
| parent | 16ac7701ad5ded0d6ecb165570b174304b07b49a (diff) | |
| parent | 07c952fff6e6ca78746815965cc6adf321dab954 (diff) | |
Merge "Revert "Temporarily disable Conscrypt perf tests"" into main
| -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); |