JS: do not use "-no-stdlib" in non-relevant tests

Rename some Ant tests: "simple[...]" -> "simpleWithoutStdlib[...]" and
"simpleWithStdlib[...]" -> "simple[...]"
This commit is contained in:
Alexander Udalov
2019-01-17 19:31:38 +01:00
parent 0659d0cba9
commit cb6fb78bc3
56 changed files with 34 additions and 53 deletions
@@ -2,7 +2,7 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js">
<kotlin2js src="${test.data}/hello.kt" output="${temp}/out.js">
<compilerarg value="-Xno-inline"/>
</kotlin2js>
</target>
@@ -3,7 +3,6 @@
<target name="build">
<kotlin2js src="${test.data}/root1"
noStdlib="true"
output="${temp}/out.js"
outputPrefix="${test.data}/prefix"
outputPostfix="${test.data}/postfix" />
+1 -1
View File
@@ -2,7 +2,7 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" >
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" >
<src>
<pathelement path="${test.data}/bar.kt"/>
<fileset dir="${test.data}/root2">
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPostfix="${test.data}/postfix" />
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPostfix="${test.data}/postfix" />
</target>
</project>
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
</target>
</project>
+1 -1
View File
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
</target>
</project>
+10 -1
View File
@@ -1,3 +1,12 @@
package foo
fun box(): String = "OK"
var ok = "FAIL"
val hello = Pair("Hello", "World")
fun main() {
ok = "OK"
println(hello.first + " " + hello.second)
}
fun box(): String = ok
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
</target>
</project>
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
</target>
</project>
@@ -1,12 +0,0 @@
package foo
var ok = "FAIL"
val hello = Pair("Hello", "World")
fun main() {
ok = "OK"
println(hello.first + " " + hello.second)
}
fun box(): String = ok
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
</target>
</project>
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
</target>
</project>
@@ -0,0 +1,3 @@
package foo
fun box(): String = "OK"
+1 -1
View File
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true"/>
</target>
</project>
+1 -1
View File
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" verbose="true"/>
</target>
</project>
+1 -1
View File
@@ -2,6 +2,6 @@
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" printVersion="true"/>
</target>
</project>