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

gradle-plugin, tests: Fix useInterop test for Windows

Browse Source
This commit is contained in:
Ilya Matveev
2017-08-14 12:29:33 +07:00
committed by ilmat192
parent 1d3e9a6ffa
commit 80dcd012e4
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/TaskSpecification.groovy
+4 -7
View File
@@ -73,16 +73,13 @@ class TaskSpecification extends BaseKonanSpecification {
result.task(":printArgs") != null result.task(":printArgs") != null
result.task(":printArgs").outcome == TaskOutcome.SUCCESS result.task(":printArgs").outcome == TaskOutcome.SUCCESS
def expectedKlibPath = project.konanBuildDir.toPath() def expectedKlibPath = project.konanBuildDir.toPath()
.resolve("interopCompiledStubs/stdioInteropStubs/stdioInteropStubs.klib") .resolve("interopCompiledStubs${File.separator}stdioInteropStubs${File.separator}stdioInteropStubs.klib")
.toFile().canonicalPath .toFile().canonicalPath
def expectedBcPath = project.konanBuildDir.toPath() def expectedBcPath = project.konanBuildDir.toPath()
.resolve("nativelibs/genStdioInteropStubs/stdiostubs.bc") .resolve("nativelibs${File.separator}genStdioInteropStubs${File.separator}stdiostubs.bc")
.toFile().canonicalPath .toFile().canonicalPath
result.output.contains(""" def ls = System.lineSeparator()
[-lpthread] result.output.contains("[-lpthread]$ls[$expectedKlibPath]$ls[$expectedBcPath]".stripIndent().trim())
[$expectedKlibPath]
[$expectedBcPath]
""".stripIndent().trim())
} }
} }