azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS backend: fixes after rename testFiles -> testData

Browse Source
This commit is contained in:
Zalim Bashorov
2014-02-26 15:42:05 +04:00
parent 442215e829
commit 5f847bc7e7
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1 -1
View File
@@ -241,7 +241,7 @@
debug="false" debug="false"
output="${kotlin-home}/lib/kotlin.js" > output="${kotlin-home}/lib/kotlin.js" >
<sources dir="${basedir}/js/js.translator/testFiles"> <sources dir="${basedir}/js/js.translator/testData">
<file name="kotlin_lib_ecma5.js"/> <file name="kotlin_lib_ecma5.js"/>
<file name="kotlin_lib.js"/> <file name="kotlin_lib.js"/>
<file name="maps.js"/> <file name="maps.js"/>
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+1 -1
View File
@@ -44,7 +44,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
protected static final Iterable<EcmaVersion> DEFAULT_ECMA_VERSIONS = Lists.newArrayList(EcmaVersion.v5); protected static final Iterable<EcmaVersion> DEFAULT_ECMA_VERSIONS = Lists.newArrayList(EcmaVersion.v5);
private static final boolean DELETE_OUT = false; private static final boolean DELETE_OUT = false;
private static final String TEST_FILES = "js/js.translator/testFiles/"; private static final String TEST_FILES = "js/js.translator/testData/";
private static final String CASES = "cases/"; private static final String CASES = "cases/";
private static final String OUT = "out/"; private static final String OUT = "out/";
private static final String EXPECTED = "expected/"; private static final String EXPECTED = "expected/";
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class StdLibJsArrayQUnitTest extends StdLibQUnitTestSupport {
} }
// TODO for some reason this test fails when ran as part of all the js-backend tests, but works stand alone // TODO for some reason this test fails when ran as part of all the js-backend tests, but works stand alone
// generates: ReferenceError: "QUnit" is not defined. (js/js.translator/testFiles/stdlib/out/ArrayQUnitTest.compiler_v3.js#3058) // generates: ReferenceError: "QUnit" is not defined. (js/js.translator/testData/stdlib/out/ArrayQUnitTest.compiler_v3.js#3058)
// when ran in batch // when ran in batch
public void DISABLED_testArrayQUnitTest() throws Exception { public void DISABLED_testArrayQUnitTest() throws Exception {
js/js.translator/qunit/index.html
+3 -3
View File
@@ -6,9 +6,9 @@
<link rel="stylesheet" href="qunit.css"> <link rel="stylesheet" href="qunit.css">
<script src="qunit.js"></script> <script src="qunit.js"></script>
<script src="../testFiles/kotlin_lib_ecma5.js"></script> <script src="../testData/kotlin_lib_ecma5.js"></script>
<script src="../testFiles/kotlin_lib.js"></script> <script src="../testData/kotlin_lib.js"></script>
<script src="../testFiles/kotlin-js-library/out/GenerateTestCase.compiler_v5.js"></script> <script src="../testData/kotlin-js-library/out/GenerateTestCase.compiler_v5.js"></script>
<script src="deepEqual.js"></script> <script src="deepEqual.js"></script>
<script src="swarminject.js"></script> <script src="swarminject.js"></script>
libraries/tools/kotlin-js-library/pom.xml
+3 -3
View File
@@ -84,11 +84,11 @@
</fileset> </fileset>
</copy> </copy>
<copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/maps.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testData/maps.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib.js"/>
<copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js" <copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js"
file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib_ecma5.js"/> file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib_ecma5.js"/>
</target> </target>
</configuration> </configuration>
<goals> <goals>