Skip to content

Commit f3d0bc7

Browse files
committed
Disable launch script integration tests on aarch64 linux and mac
See gh-35229
1 parent b3226c5 commit f3d0bc7

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@
1818

1919
import java.util.List;
2020

21+
import org.junit.jupiter.api.condition.OS;
2122
import org.junit.jupiter.params.ParameterizedTest;
2223
import org.junit.jupiter.params.provider.MethodSource;
2324

25+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2426
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
2527

2628
import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +34,8 @@
3234
* @author Andy Wilkinson
3335
*/
3436
@DisabledIfDockerUnavailable
37+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
38+
disabledReason = "The docker images have no ARM support")
3539
class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
3640

3741
JarLaunchScriptIntegrationTests() {

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
import java.util.regex.Pattern;
2121

2222
import org.junit.jupiter.api.Assumptions;
23+
import org.junit.jupiter.api.condition.OS;
2324
import org.junit.jupiter.params.ParameterizedTest;
2425
import org.junit.jupiter.params.provider.MethodSource;
2526

2627
import org.springframework.boot.ansi.AnsiColor;
28+
import org.springframework.boot.testsupport.junit.DisabledOnOs;
2729
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
2830

2931
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,6 +38,8 @@
3638
* @author Alexey Vinogradov
3739
*/
3840
@DisabledIfDockerUnavailable
41+
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
42+
disabledReason = "The docker images have no ARM support")
3943
class SysVinitLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
4044

4145
SysVinitLaunchScriptIntegrationTests() {

0 commit comments

Comments
 (0)