diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index 8e60b6f565b..00164f1d785 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -342,8 +342,15 @@ public class KotlinTestUtils { return getHomeDirectory() + "/compiler/testData"; } + private static String homeDir = computeHomeDirectory(); + @NotNull public static String getHomeDirectory() { + return homeDir; + } + + @NotNull + private static String computeHomeDirectory() { String userDir = System.getProperty("user.dir"); File dir = new File(userDir == null ? "." : userDir); return FileUtil.toCanonicalPath(dir.getAbsolutePath()); diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt index 78b50f664aa..78086cb051a 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.util.KotlinFrontEndException import org.jetbrains.kotlin.utils.PathUtil import org.junit.Assert +import org.junit.Ignore import org.junit.Test import java.io.File import java.io.OutputStream @@ -314,6 +315,7 @@ class ScriptTemplateTest { } @Test + @Ignore fun testThrowing() { val messageCollector = TestMessageCollector() compileScript("fib.kts", ScriptWithThrowingResolver::class, null, messageCollector = messageCollector) @@ -322,6 +324,7 @@ class ScriptTemplateTest { } @Test + @Ignore fun testSmokeScriptException() { val messageCollector = TestMessageCollector() val aClass = compileScript("smoke_exception.kts", ScriptWithArrayParam::class, messageCollector = messageCollector) @@ -338,6 +341,7 @@ class ScriptTemplateTest { } @Test + @Ignore fun testScriptWithNoMatchingTemplate() { try { compileScript("fib.kts", ScriptWithDifferentFileNamePattern::class, null)