Always use default 1.6 build target unless of 'jvm-target' option

2016-12-12 10:33:33 +01:00
parent ef662a5679
commit dc5c3a478c
14 changed files with 27 additions and 106 deletions
@@ -176,6 +176,12 @@ public class CliTestGenerated extends AbstractCliTest {
            doJvmTest(fileName);
        }

+        @TestMetadata("jvm8Target.args")
+        public void testJvm8Target() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/jvm8Target.args");
+            doJvmTest(fileName);
+        }
+
        @TestMetadata("kotlinPackage.args")
        public void testKotlinPackage() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/kotlinPackage.args");
@@ -546,24 +546,6 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
        );
    }

-    public void testTarget6Inheritance() throws Exception {
-        target6Inheritance();
-    }
-
-    public void testTarget6MultiInheritance() throws Exception {
-        target6Inheritance();
-    }
-
-    private void target6Inheritance() {
-        compileKotlin("target6.kt", tmpdir);
-
-        Pair<String, ExitCode> outputMain = compileKotlin("main.kt", tmpdir, Arrays.asList("-jvm-target", "1.8"), tmpdir);
-
-        KotlinTestUtils.assertEqualsToFile(
-                new File(getTestDataDirectory(), "output.txt"), normalizeOutput(outputMain)
-        );
-    }
-
    public void testTypeAliasesAreInvisibleInCompatibilityMode() {
        compileKotlin("typeAliases.kt", tmpdir);