Skip to content

Commit 527e3be

Browse files
committed
Disable Conscrypt tests on aarch64
On OpenJDK, Conscrypt only supports Intel architectures. ARM builds are not available for Windows, Linux, or macOS.
1 parent 2648f67 commit 527e3be

File tree

1 file changed

+2
-4
lines changed
  • httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio

1 file changed

+2
-4
lines changed

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AlpnTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.junit.jupiter.api.condition.DisabledOnOs;
3737
import org.junit.jupiter.api.condition.EnabledForJreRange;
3838
import org.junit.jupiter.api.condition.JRE;
39-
import org.junit.jupiter.api.condition.OS;
4039
import org.junit.jupiter.api.parallel.Isolated;
4140

4241
class AlpnTests {
@@ -55,7 +54,7 @@ public OracleJSSEAlpnTest() throws Exception {
5554
@Nested
5655
@Isolated
5756
@DisplayName("ALPN Conscrypt (Java 9 or newer)")
58-
@DisabledOnOs(OS.MAC)
57+
@DisabledOnOs(architectures = "aarch64")
5958
@EnabledForJreRange(min = JRE.JAVA_9)
6059
class ConscryptJSSEAlpnTest extends AlpnTest {
6160

@@ -68,13 +67,12 @@ public ConscryptJSSEAlpnTest() throws Exception {
6867
@Nested
6968
@Isolated
7069
@DisplayName("ALPN Conscrypt (Conscrypt specific TLS strategies)")
71-
@DisabledOnOs(OS.MAC)
70+
@DisabledOnOs(architectures = "aarch64")
7271
class ConscryptJSSEAndStrategiesAlpnTest extends AlpnTest {
7372

7473
public ConscryptJSSEAndStrategiesAlpnTest() throws Exception {
7574
super("Conscrypt", ConscryptServerTlsStrategy::new, ConscryptClientTlsStrategy::new);
7675
}
7776

7877
}
79-
8078
}

0 commit comments

Comments
 (0)