azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix tests after supporting GCC for HMPP

Browse Source 
^KT-49933
This commit is contained in:
Anton Lakotka
2023-01-12 17:57:47 +01:00
committed by Space Team
parent 02e97dcbc1
commit b689c07b01
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KlibBasedMppIT.kt
+7 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.konan.target.HostManager
import java.io.File
@@ -343,11 +344,16 @@ class KlibBasedMppIT : BaseGradleIT() {
checkNoItemContains: List<Regex>
) = with(testCase) {
setupWorkingDir()
@Suppress("INVISIBLE_MEMBER")
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
val printingTaskName = "printItems${testBuildRunId++}"
gradleBuildScript(subproject).appendText(
"""
${'\n'}
tasks.create("$printingTaskName") {
tasks.register("$printingTaskName") {
dependsOn("$transformAllTaskName")
doLast {
println("###$printingTaskName" + $itemsExpression)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
+7 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
import org.jetbrains.kotlin.gradle.testbase.*
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.extension.ExtensionContext
@@ -658,10 +659,15 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
} else {
if (isBuildGradleKts) buildGradleKts else buildGradle
}
@Suppress("INVISIBLE_MEMBER")
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
buildFile.appendText(
"""
tasks.create("$printingTaskName") {
tasks.register("$printingTaskName") {
if ("$transformAllTaskName" in tasks.names) dependsOn("$transformAllTaskName")
doLast {
println("###$printingTaskName " + $itemsExpression)
}