From 37105205491065a65c53167889f9a470353ab3cf Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Tue, 17 May 2016 17:09:11 +0300 Subject: [PATCH] Maven: fix integration tests --- .../src/it/test-executeKotlinScriptBuildAccess/pom.xml | 2 +- .../src/it/test-executeKotlinScriptBuildAccess/verify.bsh | 2 +- .../src/it/test-executeKotlinScriptCompileError/pom.xml | 2 +- .../src/it/test-executeKotlinScriptCompileError/verify.bsh | 2 +- .../src/it/test-executeKotlinScriptFile/pom.xml | 2 +- .../src/it/test-executeKotlinScriptFile/verify.bsh | 2 +- .../src/it/test-executeKotlinScriptInline/pom.xml | 2 +- .../src/it/test-executeKotlinScriptInline/verify.bsh | 2 +- .../src/it/test-executeKotlinScriptScriptException/pom.xml | 2 +- .../src/it/test-executeKotlinScriptScriptException/verify.bsh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml index fd7da9c468c..ce563ba20e2 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 0.1-SNAPSHOT + 1.1-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/verify.bsh index 78cece6e61a..df0a7d3f49c 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/verify.bsh @@ -1,3 +1,3 @@ -source("verify-common.bsh"); +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] kotlin build script accessing build info of test-executeKotlinScriptBuildAccess project") \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml index b3d4f18ac2f..b01b587a098 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 0.1-SNAPSHOT + 1.1-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/verify.bsh index e4fe18ea53a..44b7a24fa28 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/verify.bsh @@ -1,4 +1,4 @@ -source("verify-common.bsh"); +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] BUILD FAILURE"); assertBuildLogHasLineThatContains("Unresolved reference: compileErrorHere"); \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml index 1f606cbcb1a..ab1da4d9eb0 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 0.1-SNAPSHOT + 1.1-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/verify.bsh index 8a8264740fa..36249025565 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/verify.bsh @@ -1,3 +1,3 @@ -source("verify-common.bsh"); +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("Hello from Kotlin script file!") \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml index d51388e34b0..858daf6c0e5 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 0.1-SNAPSHOT + 1.1-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/verify.bsh index a6b9011a50c..2a209c2d210 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/verify.bsh @@ -1,3 +1,3 @@ -source("verify-common.bsh"); +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("Hello from inline Kotlin script!") \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml index 6cf0c623dbd..2ab6a26b250 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 0.1-SNAPSHOT + 1.1-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh index 72ac6fab331..957df3346fc 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh @@ -1,4 +1,4 @@ -source("verify-common.bsh"); +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] BUILD FAILURE"); assertBuildLogHasLineThatContains("script threw an exception: exception from script"); \ No newline at end of file