From 209c0fe819638c8ba8874d0d54391c35d62c43fb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 6 Aug 2021 22:47:26 +0200 Subject: [PATCH] Revert "[Test] Temporary mute some tests because of problems with RepeatedAnnotationLowering" This reverts commit 3a210f6c8100a0416d18419a4036933fd3c3fee6. --- .../jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt | 7 +++---- .../test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt index ec6dddab2d7..3b123428cfd 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt @@ -41,7 +41,6 @@ import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparatorAdaptor.valid import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.* import org.jetbrains.org.objectweb.asm.tree.ClassNode -import org.junit.Ignore import java.io.ByteArrayInputStream import java.io.DataInputStream import java.io.File @@ -375,9 +374,9 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration doTestKotlinLibraryWithWrongMetadataVersion("library", null, "-Xskip-prerelease-check") } -// fun testRequireKotlin() { -// compileKotlin("source.kt", tmpdir, listOf(compileLibrary("library"))) -// } + fun testRequireKotlin() { + compileKotlin("source.kt", tmpdir, listOf(compileLibrary("library"))) + } fun testRequireKotlinInNestedClasses() { compileKotlin("source.kt", tmpdir, listOf(compileLibrary("library"))) diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt index 73aaed08750..6b04bb8df39 100644 --- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt +++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt @@ -37,7 +37,6 @@ class MainKtsIT { } @Test - @Ignore fun testImport() { val mainKtsJar = File("dist/kotlinc/lib/kotlin-main-kts.jar") Assert.assertTrue("kotlin-main-kts.jar not found, run dist task: ${mainKtsJar.absolutePath}", mainKtsJar.exists()) @@ -70,7 +69,6 @@ class MainKtsIT { @OptIn(ExperimentalPathApi::class) @Test - @Ignore fun testCache() { val script = File("$TEST_DATA_ROOT/import-test.main.kts").absolutePath val cache = createTempDirectory("main.kts.test") @@ -98,7 +96,6 @@ class MainKtsIT { @OptIn(ExperimentalPathApi::class) @Test - @Ignore fun testCacheInProcess() { val script = File("$TEST_DATA_ROOT/import-test.main.kts").absolutePath val cache = createTempDirectory("main.kts.test")