Supress Gradle warnings for some macos tests as a workaround for KT-55751

Merge-request: KT-MR-8277
Merged-by: Artem Daugel-Dauge <Artem.Daugel-Dauge@jetbrains.com>
This commit is contained in:
Artem Daugel-Dauge
2023-01-12 19:47:21 +00:00
committed by Space Team
parent ed9f5497fb
commit 1216c39865
3 changed files with 33 additions and 8 deletions
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.native
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.util.AGPVersion
@@ -40,7 +41,9 @@ class AppleFrameworkIT : BaseGradleIT() {
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use"
)
),
// Workaround for KT-55751
warningMode = WarningMode.None,
)
build("assembleDebugAppleFrameworkForXcodeIosArm64", options = options) {
assertSuccessful()
@@ -68,7 +71,9 @@ class AppleFrameworkIT : BaseGradleIT() {
"ARCHS" to "arm64 x86_64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use"
)
),
// Workaround for KT-55751
warningMode = WarningMode.None,
)
build("assembleReleaseAppleFrameworkForXcode", options = options) {
assertSuccessful()
@@ -92,7 +97,9 @@ class AppleFrameworkIT : BaseGradleIT() {
"EXPANDED_CODE_SIGN_IDENTITY" to "-",
"TARGET_BUILD_DIR" to workingDir.absolutePath,
"FRAMEWORKS_FOLDER_PATH" to "${projectName}/build/xcode-derived"
)
),
// Workaround for KT-55751
warningMode = WarningMode.None,
)
build(":shared:embedAndSignAppleFrameworkForXcode", options = options) {
assertSuccessful()
@@ -192,7 +199,9 @@ class AppleFrameworkIT : BaseGradleIT() {
"ARCHS" to "arm64",
"TARGET_BUILD_DIR" to "no use",
"FRAMEWORKS_FOLDER_PATH" to "no use"
)
),
// Workaround for KT-55751
warningMode = WarningMode.None,
)
setupWorkingDir()
projectDir.resolve("shared/build.gradle.kts").modify {
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.native
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Companion.DUMMY_FRAMEWORK_TASK_NAME
@@ -1114,7 +1115,10 @@ class CocoaPodsIT : BaseGradleIT() {
vararg args: String
) {
// check that test executable
build(taskName, *args) {
build(taskName, *args, options = defaultBuildOptions().copy(
// Workaround for KT-55751
warningMode = WarningMode.None,
)) {
//base checks
assertSuccessful()
hooks.trigger(this)
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.native
import com.intellij.testFramework.TestDataFile
import org.gradle.api.logging.configuration.WarningMode
import org.jdom.input.SAXBuilder
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
@@ -311,6 +312,17 @@ class GeneralNativeIT : BaseGradleIT() {
fun testCanProduceNativeFrameworks() = with(
transformNativeTestProjectWithPluginDsl("frameworks", directoryPrefix = "native-binaries")
) {
fun assemble(check: CompiledProject.() -> Unit) {
build(
"assemble",
options = defaultBuildOptions().copy(
// Workaround for KT-55751
warningMode = WarningMode.None,
),
check = check
)
}
Assume.assumeTrue(HostManager.hostIsMac)
data class BinaryMeta(val name: String, val isStatic: Boolean = false)
@@ -368,7 +380,7 @@ class GeneralNativeIT : BaseGradleIT() {
// Check building
// Check dependency exporting and bitcode embedding in frameworks.
build("assemble") {
assemble {
assertSuccessful()
headerPaths.forEach { assertFileExists(it) }
frameworkPaths.forEach { assertFileExists(it) }
@@ -409,13 +421,13 @@ class GeneralNativeIT : BaseGradleIT() {
}
}
build("assemble") {
assemble {
assertSuccessful()
assertTasksUpToDate(frameworkTasks)
}
assertTrue(projectDir.resolve(headerPaths[0]).delete())
build("assemble") {
assemble {
assertSuccessful()
assertTasksUpToDate(frameworkTasks.drop(1))
assertTasksExecuted(frameworkTasks[0])