From 80dcd012e4527ed9a46893b06043cb265514e9ef Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 14 Aug 2017 12:29:33 +0700 Subject: [PATCH] gradle-plugin, tests: Fix useInterop test for Windows --- .../gradle/plugin/test/TaskSpecification.groovy | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/TaskSpecification.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/TaskSpecification.groovy index 7fbd73df14b..e38f8cbcf71 100644 --- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/TaskSpecification.groovy +++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/TaskSpecification.groovy @@ -73,16 +73,13 @@ class TaskSpecification extends BaseKonanSpecification { result.task(":printArgs") != null result.task(":printArgs").outcome == TaskOutcome.SUCCESS def expectedKlibPath = project.konanBuildDir.toPath() - .resolve("interopCompiledStubs/stdioInteropStubs/stdioInteropStubs.klib") + .resolve("interopCompiledStubs${File.separator}stdioInteropStubs${File.separator}stdioInteropStubs.klib") .toFile().canonicalPath def expectedBcPath = project.konanBuildDir.toPath() - .resolve("nativelibs/genStdioInteropStubs/stdiostubs.bc") + .resolve("nativelibs${File.separator}genStdioInteropStubs${File.separator}stdiostubs.bc") .toFile().canonicalPath - result.output.contains(""" - [-lpthread] - [$expectedKlibPath] - [$expectedBcPath] - """.stripIndent().trim()) + def ls = System.lineSeparator() + result.output.contains("[-lpthread]$ls[$expectedKlibPath]$ls[$expectedBcPath]".stripIndent().trim()) } }