From 1f6788ac31f7a06ee67a6b56ecfa8ce3683e047d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 17 Jul 2017 11:57:03 +0200 Subject: [PATCH] Fix CodeConformanceTest on Windows --- compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 5f60b19df53..16018d5145c 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -151,7 +151,7 @@ class CodeConformanceTest : TestCase() { val root = File(".").absoluteFile val knownThirdPartyCode = loadKnownThirdPartyCodeList() for (sourceFile in FileUtil.findFilesByMask(SOURCES_FILE_PATTERN, root)) { - val relativePath = sourceFile.toRelativeString(root) + val relativePath = FileUtil.toSystemIndependentName(sourceFile.toRelativeString(root)) if (COPYRIGHT_EXCLUDED_FILES_AND_DIRS.any { relativePath.startsWith(it) } || knownThirdPartyCode.any { relativePath.startsWith(it)}) continue