[Gradle] Fix tests after supporting GCC for HMPP
^KT-49933
This commit is contained in:
committed by
Space Team
parent
02e97dcbc1
commit
b689c07b01
+7
-1
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
|
||||||
import org.jetbrains.kotlin.gradle.util.modify
|
import org.jetbrains.kotlin.gradle.util.modify
|
||||||
import org.jetbrains.kotlin.konan.target.HostManager
|
import org.jetbrains.kotlin.konan.target.HostManager
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@@ -343,11 +344,16 @@ class KlibBasedMppIT : BaseGradleIT() {
|
|||||||
checkNoItemContains: List<Regex>
|
checkNoItemContains: List<Regex>
|
||||||
) = with(testCase) {
|
) = with(testCase) {
|
||||||
setupWorkingDir()
|
setupWorkingDir()
|
||||||
|
|
||||||
|
@Suppress("INVISIBLE_MEMBER")
|
||||||
|
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
|
||||||
|
|
||||||
val printingTaskName = "printItems${testBuildRunId++}"
|
val printingTaskName = "printItems${testBuildRunId++}"
|
||||||
gradleBuildScript(subproject).appendText(
|
gradleBuildScript(subproject).appendText(
|
||||||
"""
|
"""
|
||||||
${'\n'}
|
${'\n'}
|
||||||
tasks.create("$printingTaskName") {
|
tasks.register("$printingTaskName") {
|
||||||
|
dependsOn("$transformAllTaskName")
|
||||||
doLast {
|
doLast {
|
||||||
println("###$printingTaskName" + $itemsExpression)
|
println("###$printingTaskName" + $itemsExpression)
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-1
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle
|
|||||||
|
|
||||||
import org.gradle.api.logging.configuration.WarningMode
|
import org.gradle.api.logging.configuration.WarningMode
|
||||||
import org.gradle.util.GradleVersion
|
import org.gradle.util.GradleVersion
|
||||||
|
import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator
|
||||||
import org.jetbrains.kotlin.gradle.testbase.*
|
import org.jetbrains.kotlin.gradle.testbase.*
|
||||||
import org.junit.jupiter.api.DisplayName
|
import org.junit.jupiter.api.DisplayName
|
||||||
import org.junit.jupiter.api.extension.ExtensionContext
|
import org.junit.jupiter.api.extension.ExtensionContext
|
||||||
@@ -658,10 +659,15 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
|
|||||||
} else {
|
} else {
|
||||||
if (isBuildGradleKts) buildGradleKts else buildGradle
|
if (isBuildGradleKts) buildGradleKts else buildGradle
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("INVISIBLE_MEMBER")
|
||||||
|
val transformAllTaskName = KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA
|
||||||
|
|
||||||
buildFile.appendText(
|
buildFile.appendText(
|
||||||
"""
|
"""
|
||||||
|
|
||||||
tasks.create("$printingTaskName") {
|
tasks.register("$printingTaskName") {
|
||||||
|
if ("$transformAllTaskName" in tasks.names) dependsOn("$transformAllTaskName")
|
||||||
doLast {
|
doLast {
|
||||||
println("###$printingTaskName " + $itemsExpression)
|
println("###$printingTaskName " + $itemsExpression)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user