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

Fixed paths unification in tests on some Windows machines.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-11-11 20:36:46 +03:00
parent b39d34ca8d
commit 868a8dbc84
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt
+4 -2
View File
@@ -60,7 +60,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
get() = false get() = false
fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String { fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String {
val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath())
val logger = MyLogger(workDirPath)
val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) val descriptor = createProjectDescriptor(BuildLoggingManager(logger))
try { try {
val buildResult = doBuild(descriptor, scope)!! val buildResult = doBuild(descriptor, scope)!!
@@ -69,8 +70,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
buildResult buildResult
.getMessages(BuildMessage.Kind.ERROR) .getMessages(BuildMessage.Kind.ERROR)
.joinToString("\n") .joinToString("\n")
.replace(workDir.getAbsolutePath(), "\$PROJECT")
.replace(File.separatorChar, '/') .replace(File.separatorChar, '/')
.replace("/" + workDirPath, "\$PROJECT") // Sometimes path is rendered as "/C:/foo/bar" on Windows
.replace(workDirPath, "\$PROJECT")
return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n"
} }
else { else {