Annotate explicitly stdlib tests, which must be excluded from JS stdlib tests with @JvmVersion, do not use file naming convention, use preprocessor instead.

This commit is contained in:
Ilya Gorbunov
2016-10-18 19:08:53 +03:00
parent baccac30fb
commit badbcd08de
28 changed files with 67 additions and 19 deletions
+19 -17
View File
@@ -23,6 +23,11 @@
</dependency>
</dependencies>
<properties>
<kotlin-home>${kotlin-dist}/kotlinc</kotlin-home>
<pp-profile>JS</pp-profile>
</properties>
<build>
<plugins>
<plugin>
@@ -37,24 +42,21 @@
<target>
<delete dir="${basedir}/target/tests" failonerror="false"/>
<mkdir dir="${basedir}/target/tests"/>
<java classname="org.jetbrains.kotlin.preloading.Preloader" failonerror="true" fork="true">
<classpath>
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
</classpath>
<assertions>
<enable/>
</assertions>
<arg value="-cp"/>
<arg value="${kotlin-home}/lib/kotlin-compiler.jar"/>
<arg value="org.jetbrains.kotlin.preprocessor.PreprocessorCLI"/>
<arg value="${basedir}/../../stdlib/test"/>
<arg value="${basedir}/target/tests"/>
<arg value="${pp-profile}"/>
</java>
<copy todir="${basedir}/target/tests">
<fileset dir="${basedir}/../../stdlib/test">
<include name="**/*.kt"/>
<!-- exclude JVM tests-->
<exclude name="**/*JVM.kt"/>
<exclude name="**/*JVMTest.kt"/>
<exclude name="**/*JVMTests.kt"/>
<exclude name="concurrent/**"/>
<exclude name="io/**"/>
<exclude name="reflection/**"/>
<!-- Can't run: spaces in function name KT-4160 -->
<exclude name="language/EscapedTestNamesTest.kt"/>
</fileset>
<fileset dir="${basedir}/../../../js/js.libraries/test">
<include name="**/*.kt" />
</fileset>