Remove integration test involving kotlin-stdlib-jre7/8

This commit is contained in:
Ilya Gorbunov
2019-02-13 17:45:59 +03:00
parent 811566bbe0
commit 8ed2facc8c
5 changed files with 0 additions and 51 deletions
@@ -1,12 +0,0 @@
OUT:
Buildfile: [TestData]/build.xml
build:
[kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/test.jar]
[kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre7.jar: warning: kotlin-stdlib-jre7 is deprecated. Please use kotlin-stdlib-jdk7 instead
[kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre8.jar: warning: kotlin-stdlib-jre8 is deprecated. Please use kotlin-stdlib-jdk8 instead
BUILD SUCCESSFUL
Total time: [time]
Return code: 0
@@ -1,15 +0,0 @@
<project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build">
<kotlinc src="${test.data}/main.kt" output="${temp}/test.jar" nowarn="true">
<classpath>
<file file="${kotlin.stdlib.jre7.jar}"/>
<file file="${kotlin.stdlib.jre8.jar}"/>
<file file="${kotlin.stdlib.jdk7.jar}"/>
<file file="${kotlin.stdlib.jdk8.jar}"/>
</classpath>
<compilerarg line="-jvm-target 1.8"/>
</kotlinc>
</target>
</project>
@@ -1,15 +0,0 @@
import java.util.stream.Stream
import kotlin.streams.*
// kotlin-stdlib-jdk7
fun testUse(c: AutoCloseable) = c.use {}
// kotlin-stdlib-jdk8
fun testGet(c: MatchGroupCollection) = c.get("")
fun testGetOrDefault(c: Map<out Number, Any>) = c.getOrDefault(42, "")
fun testRemove(c: MutableMap<out Number, Any>) = c.remove(42, "")
fun testAsSequence(c: Stream<String>) = c.asSequence()
@@ -42,10 +42,6 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase {
"-Dkotlin.lib=" + KotlinIntegrationTestBase.getCompilerLib(),
"-Dkotlin.runtime.jar=" + ForTestCompileRuntime.runtimeJarForTests().getAbsolutePath(),
"-Dkotlin.reflect.jar=" + ForTestCompileRuntime.reflectJarForTests().getAbsolutePath(),
"-Dkotlin.stdlib.jre7.jar=" + new File("dist/kotlin-stdlib-jre7.jar").getAbsolutePath(),
"-Dkotlin.stdlib.jre8.jar=" + new File("dist/kotlin-stdlib-jre8.jar").getAbsolutePath(),
"-Dkotlin.stdlib.jdk7.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk7.jar").getAbsolutePath(),
"-Dkotlin.stdlib.jdk8.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk8.jar").getAbsolutePath(),
"-Dtest.data=" + testDataDir,
"-Dtemp=" + tmpdir,
"-cp", antClasspath,
@@ -109,11 +109,6 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest {
runTest("compiler/testData/integration/ant/jvm/stdlibForJavacWithNoKotlin/");
}
@TestMetadata("stdlibJre78AndStdlibJdk78")
public void testStdlibJre78AndStdlibJdk78() throws Exception {
runTest("compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/");
}
@TestMetadata("suppressWarnings")
public void testSuppressWarnings() throws Exception {
runTest("compiler/testData/integration/ant/jvm/suppressWarnings/");