diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index f0bac02f486..e3d5cce8c0a 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -69,10 +69,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val errorMessages = buildResult .getMessages(BuildMessage.Kind.ERROR) + .map { it.getMessageText() } + .map { it.replaceAll("^[^:]+:\\d+:\\s+", "") } .joinToString("\n") - .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" } else { diff --git a/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index bfc18950439..50b3c2435b7 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -9,5 +9,5 @@ src/class1.kt src/class2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Redeclaration: Klass -Kotlin:ERROR:Redeclaration: Klass \ No newline at end of file +Redeclaration: Klass +Redeclaration: Klass \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 85f35fb29cb..1e9444f5d38 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -6,7 +6,7 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expecting an expression +Expecting an expression Cleaning output files: @@ -15,4 +15,4 @@ End of files Compiling files: src/fun.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 872cccb99f3..65aedde795b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -6,9 +6,9 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expecting an expression +Expecting an expression Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index c7c84ffc8d8..da0ddacad97 100644 --- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -6,6 +6,6 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): +Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.List): kotlin.Unit \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index f9713085579..64909e968ed 100644 --- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -6,6 +6,6 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function()V): +Platform declaration clash: The following declarations have the same JVM signature (function()V): fun function(): kotlin.Unit fun function(): kotlin.Unit \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 15793b4067f..b605f561a83 100644 --- a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -6,6 +6,6 @@ Compiling files: src/prop2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): +Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): fun (): kotlin.Int fun (): kotlin.Int \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log index a44ae0a4d8c..6f16bf547fb 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -11,5 +11,5 @@ Compiling files: src/Sub.kt End of files COMPILATION FAILED -Kotlin:ERROR:Cannot weaken access privilege 'public' for 'y' in 'Super' -Kotlin:ERROR:'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file +Cannot weaken access privilege 'public' for 'y' in 'Super' +'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 7dcafae29b6..ab1f7d8e3de 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -15,4 +15,4 @@ src/willBeResolvedToOther.kt src/willBeUnresolved.kt End of files COMPILATION FAILED -Kotlin:ERROR:Unresolved reference: f +Unresolved reference: f \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index e31f0b60e64..0a8d4fef107 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -17,7 +17,7 @@ src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object -Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Please specify constructor invocation; classifier 'SamInterface' does not have a class object \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 0c78e0c1820..63f1f972e93 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -9,6 +9,6 @@ Compiling files: src/WillBeUnresolved.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +cannot find symbol symbol : method f(java.lang.String) location: class test.TestPackage \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index 739009bbe79..af4ae9aa96e 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -8,4 +8,4 @@ Compiling files: src/Sub.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/Sub.java:2: y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file +y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 59f1f29a253..e0214e9fc16 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -9,6 +9,6 @@ Compiling files: src/WillBeUnresolved.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +cannot find symbol symbol : method getProp() -location: class test.TestPackage +location: class test.TestPackage \ No newline at end of file