From 1163e92e5a2c7035ea0c731e50d92a8f458fcdea Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 22 Jun 2026 13:55:57 +0800 Subject: [PATCH] Enable tests on Windows ARM64 again --- .../gradle/plugins/shadow/ApplicationPluginTest.kt | 8 -------- .../jengelman/gradle/plugins/shadow/PublishingTest.kt | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt index 9fc8fd703..ff0c213e4 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt @@ -26,18 +26,10 @@ import kotlin.io.path.relativeTo import kotlin.io.path.walk import kotlin.io.path.writeText import org.junit.jupiter.api.Test -import org.junit.jupiter.api.condition.DisabledOnOs -import org.junit.jupiter.api.condition.OS class ApplicationPluginTest : BasePluginTest() { private lateinit var mainClass: String - @DisabledOnOs( - OS.WINDOWS, - architectures = ["aarch64"], - disabledReason = - "Cannot use toolchain on Windows ARM64", // TODO: remove when min Gradle is bumped to 9.2+ - ) @Test fun integrationWithApplicationPluginAndJavaToolchains() { prepare( diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt index 754ce1caf..a790c6a79 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt @@ -44,8 +44,6 @@ import org.gradle.api.plugins.JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME import org.gradle.testkit.runner.BuildResult import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.junit.jupiter.api.condition.DisabledOnOs -import org.junit.jupiter.api.condition.OS import org.junit.jupiter.api.io.TempDir import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource @@ -59,12 +57,6 @@ class PublishingTest : BasePluginTest() { settingsScript.appendText("rootProject.name = 'maven'$lineSeparator") } - @DisabledOnOs( - OS.WINDOWS, - architectures = ["aarch64"], - disabledReason = - "Cannot use toolchain on Windows ARM64", // TODO: remove when min Gradle is bumped to 9.2+ - ) @Test fun publishShadowJarWithCorrectTargetJvm() { projectScript.appendText(