From a6f8db5d0240b7fc364fa6bc9204cbfefb6e6160 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 29 Nov 2017 12:42:01 +0100 Subject: [PATCH] Fix script-util tests --- libraries/tools/kotlin-script-util/build.gradle.kts | 4 +++- .../kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 2d546c1c9a0..aa358cb8336 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -31,7 +31,9 @@ afterEvaluate { } } -projectTest() +projectTest { + workingDir = rootDir +} runtimeJar() sourcesJar() diff --git a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt index 89859018abc..388843bee0e 100644 --- a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt +++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt @@ -114,7 +114,7 @@ done environment: Map? = null, suppressOutput: Boolean = false ): Class<*>? = - compileScriptImpl("src/test/resources/scripts/" + scriptFileName, + compileScriptImpl("libraries/tools/kotlin-script-util/src/test/resources/scripts/" + scriptFileName, KotlinScriptDefinitionFromAnnotatedTemplate(scriptTemplate, environment), suppressOutput) private fun compileScriptImpl(