Skip to content

Commit 3400294

Browse files
authored
Skip specific webApp build checks on Windows with AGP version 8.12.3 (#5548)
For context: https://youtrack.jetbrains.com/issue/CMP-9845/Investigate-failing-gradle-plugin-test-testFinalArtefacts-on-windows-2022 ## Testing N/A ## Release Notes N/A
1 parent cb6f402 commit 3400294

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

  • gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -450,21 +450,25 @@ class ResourcesTest : GradlePluginTestBase() {
450450
}
451451
}
452452

453-
gradle(":webApp:build").checks {
454-
check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
455-
check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")
456-
457-
val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
458-
commonResourcesFiles.forEach { res ->
459-
assertTrue(jsBuildDir.resolve(res).exists())
460-
}
461-
assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())
453+
// TODO: remove skip after https://youtrack.jetbrains.com/issue/CMP-9845/
454+
val skipWebCheck = currentOS == OS.Windows && defaultTestEnvironment.agpVersion.contains("8.12.3")
455+
if (!skipWebCheck) {
456+
gradle(":webApp:build").checks {
457+
check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
458+
check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")
459+
460+
val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
461+
commonResourcesFiles.forEach { res ->
462+
assertTrue(jsBuildDir.resolve(res).exists())
463+
}
464+
assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())
462465

463-
val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
464-
commonResourcesFiles.forEach { res ->
465-
assertTrue(wasmJsBuildDir.resolve(res).exists())
466+
val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
467+
commonResourcesFiles.forEach { res ->
468+
assertTrue(wasmJsBuildDir.resolve(res).exists())
469+
}
470+
assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
466471
}
467-
assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
468472
}
469473

470474

0 commit comments

Comments
 (0)