Revert "[Gradle] Propagate offline mode to Native cinterop"
This reverts commit a28884b1
This commit is contained in:
committed by
Space
parent
146564718e
commit
0fe4c6217c
-45
@@ -1196,51 +1196,6 @@ class GeneralNativeIT : BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `check offline mode is propagated to the cinterop`() = with(transformNativeTestProjectWithPluginDsl("native-cinterop")) {
|
|
||||||
val buildOptions = defaultBuildOptions()
|
|
||||||
val cinteropTask = ":projectLibrary:cinteropAnotherNumberHost"
|
|
||||||
|
|
||||||
build(cinteropTask, options = buildOptions) {
|
|
||||||
assertSuccessful()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check that --offline works when all the dependencies are already downloaded:
|
|
||||||
val buildOptionsOffline = buildOptions.copy(freeCommandLineArgs = buildOptions.freeCommandLineArgs + "--offline")
|
|
||||||
|
|
||||||
build("clean", cinteropTask, options = buildOptionsOffline) {
|
|
||||||
assertSuccessful()
|
|
||||||
withNativeCommandLineArguments(cinteropTask, toolName = "cinterop") {
|
|
||||||
assertTrue(it.containsSequentially("-Xoverride-konan-properties", "airplaneMode=true"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check that --offline fails when there are no downloaded dependencies:
|
|
||||||
val customKonanDataDir = tempDir.newFolder("konanOffline")
|
|
||||||
val buildOptionsOfflineWithCustomKonanDataDir = buildOptionsOffline.copy(
|
|
||||||
customEnvironmentVariables = buildOptionsOffline.customEnvironmentVariables +
|
|
||||||
("KONAN_DATA_DIR" to customKonanDataDir.absolutePath)
|
|
||||||
)
|
|
||||||
|
|
||||||
build("clean", cinteropTask, options = buildOptionsOfflineWithCustomKonanDataDir) {
|
|
||||||
assertFailed()
|
|
||||||
}
|
|
||||||
|
|
||||||
checkNoDependenciesDownloaded(customKonanDataDir)
|
|
||||||
|
|
||||||
// Check that the compiler is not extracted if it is not cached:
|
|
||||||
assertTrue(customKonanDataDir.deleteRecursively())
|
|
||||||
build(
|
|
||||||
"clean", cinteropTask, "-Pkotlin.native.version=1.6.20-M1-9999",
|
|
||||||
options = buildOptionsOfflineWithCustomKonanDataDir
|
|
||||||
) {
|
|
||||||
assertFailed()
|
|
||||||
assertTasksNotExecuted(listOf(cinteropTask))
|
|
||||||
}
|
|
||||||
|
|
||||||
assertFalse(customKonanDataDir.exists())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun allowToOverrideDownloadUrl() {
|
fun allowToOverrideDownloadUrl() {
|
||||||
with(transformNativeTestProjectWithPluginDsl("native-parallel")) {
|
with(transformNativeTestProjectWithPluginDsl("native-parallel")) {
|
||||||
|
|||||||
-7
@@ -146,13 +146,6 @@ internal class KotlinNativeCInteropRunner private constructor(project: Project)
|
|||||||
fun runWithContext(action: () -> Unit)
|
fun runWithContext(action: () -> Unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
override val defaultArguments: List<String>
|
|
||||||
get() = mutableListOf<String>().apply {
|
|
||||||
if (project.gradle.startParameter.isOffline) {
|
|
||||||
addAll(listOf("-Xoverride-konan-properties", "airplaneMode=true"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun ExecutionContext.run(args: List<String>) {
|
fun ExecutionContext.run(args: List<String>) {
|
||||||
val runner = KotlinNativeCInteropRunner(project)
|
val runner = KotlinNativeCInteropRunner(project)
|
||||||
|
|||||||
Reference in New Issue
Block a user