diff options
| author | 2024-09-09 10:59:08 +0000 | |
|---|---|---|
| committer | 2024-09-09 10:59:08 +0000 | |
| commit | c6aad21248e483ff2c206486a4e128a480629296 (patch) | |
| tree | 624f1dbf4b64fa1721c7bf22482260287e09e076 | |
| parent | 7ebddb1cb50ff0be24c9718a8a3b8b0e6bb55076 (diff) | |
| parent | af78422c0da13814f52de6f4c83bcdd9c54ffc9d (diff) | |
Merge "Temporarily disable Conscrypt perf tests" into main am: af78422c0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3259691
Change-Id: I843f6bd5c9be3a7f0986e82bc8f690404153cea0
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 f20b1706129b..3577fcdf04d6 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 + // @Test Temporarily disabled @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 af3c405eab82..ac5710047db9 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 + // @Test Temporarily disabled @Parameters(method = "getParams") public void throughput(Config config) throws Exception { setup(config); |