summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Miguel Aranda <miguelaranda@google.com> 2024-09-09 10:56:00 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-09-09 10:56:00 +0000
commitaf78422c0da13814f52de6f4c83bcdd9c54ffc9d (patch)
tree42e7d658d05b9355e3aab021ff1db8fc3a5c046c
parent25658b685d121c6a9ba1d7a1d06b0ce35ab12be0 (diff)
parentd5908ace20ae7f736e4d6a872302618f7635d63e (diff)
Merge "Temporarily disable Conscrypt perf tests" into main
-rw-r--r--apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java2
-rw-r--r--apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java2
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);