| commit | 004d702cd8673e8c322419ddf18883d514f65894 | [log] [tgz] |
|---|---|---|
| author | Miguel Aranda <[email protected]> | Mon Sep 09 11:08:02 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Sep 09 11:08:02 2024 +0000 |
| tree | 9ec9e67e0822de205e297399f51320005d2adb8e | |
| parent | 95ee9df7b778698b3dd0a1f70ea2a3fbfaeb079f [diff] | |
| parent | c6aad21248e483ff2c206486a4e128a480629296 [diff] |
Merge "Temporarily disable Conscrypt perf tests" into main am: af78422c0d am: c6aad21248 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3259691 Change-Id: I46d46e1670bed77cb9ac7bfbc62bd3be9c62dc76 Signed-off-by: Automerger Merge Worker <[email protected]>
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 f20b170..3577fcd 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 @@ /** * 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 af3c405..ac57100 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 @@ executor.awaitTermination(5, TimeUnit.SECONDS); } - @Test + // @Test Temporarily disabled @Parameters(method = "getParams") public void throughput(Config config) throws Exception { setup(config);