From de2acc31eeb6af2af38e2efac5d5278f43efb40e Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 19 Nov 2014 19:09:50 +0300 Subject: [PATCH] JS backend: test for KT-6277 --- .../src/org/jetbrains/kotlin/AntTaskJsTest.java | 6 +++++- .../js/outputWithoutDirectory/build.log.expected | 9 +++++++++ .../ant/js/outputWithoutDirectory/build.xml | 14 ++++++++++++++ .../ant/js/outputWithoutDirectory/root1/foo.kt | 3 +++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected create mode 100644 compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml create mode 100644 compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java index 66514c26de0..38d0d0fa192 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage; import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker; import org.jetbrains.k2js.test.rhino.RhinoUtils; import org.junit.Rule; @@ -127,6 +126,11 @@ public class AntTaskJsTest extends AntTaskBaseTest { } + @Test + public void outputWithoutDirectory() throws Exception { + doJsAntTest(); + } + @Test public void noSrcParam() throws Exception { doAntTest(FAILED); diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected new file mode 100644 index 00000000000..7a95e4fb045 --- /dev/null +++ b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected @@ -0,0 +1,9 @@ +OUT: +Buildfile: [TestData]/build.xml + +build: + +BUILD SUCCESSFUL +Total time: [time] + +Return code: 0 diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml new file mode 100644 index 00000000000..4b3abbdf3f8 --- /dev/null +++ b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt new file mode 100644 index 00000000000..f6123b9882f --- /dev/null +++ b/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt @@ -0,0 +1,3 @@ +package foo + +fun box(): String = "OK"