From 29ff4d6677309680648999e06ead569213df0ea6 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Mon, 15 Oct 2018 17:48:51 +0300 Subject: [PATCH] [JS IR BE]: Disable incremental compilation tests until IC is supported --- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 4 +++- .../test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 5 ++++- js/js.translator/testData/box/incremental/catchScope.kt | 1 - .../testData/box/incremental/classReferencingClass.kt | 1 - js/js.translator/testData/box/incremental/coroutines.kt | 1 - .../testData/box/incremental/defaultArguments.kt | 1 - js/js.translator/testData/box/incremental/exportedPackage.kt | 1 - .../testData/box/incremental/functionReferencingClass.kt | 1 - js/js.translator/testData/box/incremental/inline.kt | 1 - js/js.translator/testData/box/incremental/inlineLambda.kt | 1 - js/js.translator/testData/box/incremental/multipleExport.kt | 1 - .../testData/box/incremental/multipleReimport.kt | 1 - .../testData/box/incremental/packagesWithSameName.kt | 1 - js/js.translator/testData/box/incremental/simple.kt | 1 - .../testData/box/incremental/sourceMapSourceEmbedding.kt | 1 - .../testData/box/incremental/syntheticStatement.kt | 1 - 16 files changed, 7 insertions(+), 16 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 95c709d70dc..286db87ec50 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -86,6 +86,8 @@ abstract class BasicBoxTest( protected open val runMinifierByDefault: Boolean = false protected open val skipMinification = System.getProperty("kotlin.js.skipMinificationTest", "false")!!.toBoolean() + protected open val incrementalCompilationChecksEnabled = true + fun doTest(filePath: String) { doTest(filePath, "OK", MainCallParameters.noCall()) } @@ -329,7 +331,7 @@ abstract class BasicBoxTest( mainCallParameters, incrementalData, remap, testPackage, testFunction ) - if (module.hasFilesToRecompile) { + if (incrementalCompilationChecksEnabled && module.hasFilesToRecompile) { checkIncrementalCompilation( sourceDirs, module, kotlinFiles, dependencies, friends, multiModule, remap, outputFile, outputPrefixFile, outputPostfixFile, mainCallParameters, incrementalData, testPackage, testFunction diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index 4f358209b00..7987ee78c92 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -114,7 +114,10 @@ abstract class BasicIrBoxTest( targetBackend = TargetBackend.JS_IR ) { - override var skipMinification = true + override val skipMinification = true + + // TODO Design incremental compilation for IR and add test support + override val incrementalCompilationChecksEnabled = false private val compilationCache = mutableMapOf() diff --git a/js/js.translator/testData/box/incremental/catchScope.kt b/js/js.translator/testData/box/incremental/catchScope.kt index e94fc1ad393..50b6db87f0d 100644 --- a/js/js.translator/testData/box/incremental/catchScope.kt +++ b/js/js.translator/testData/box/incremental/catchScope.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1280 // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/classReferencingClass.kt b/js/js.translator/testData/box/incremental/classReferencingClass.kt index 52fc36d3876..7984fea96bb 100644 --- a/js/js.translator/testData/box/incremental/classReferencingClass.kt +++ b/js/js.translator/testData/box/incremental/classReferencingClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1292 // FILE: A.kt diff --git a/js/js.translator/testData/box/incremental/coroutines.kt b/js/js.translator/testData/box/incremental/coroutines.kt index d7c196a5498..aea254e912a 100644 --- a/js/js.translator/testData/box/incremental/coroutines.kt +++ b/js/js.translator/testData/box/incremental/coroutines.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1302 // FILE: a.kt // WITH_RUNTIME diff --git a/js/js.translator/testData/box/incremental/defaultArguments.kt b/js/js.translator/testData/box/incremental/defaultArguments.kt index b633e06747d..53124fa3407 100644 --- a/js/js.translator/testData/box/incremental/defaultArguments.kt +++ b/js/js.translator/testData/box/incremental/defaultArguments.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1280 // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/exportedPackage.kt b/js/js.translator/testData/box/incremental/exportedPackage.kt index 4f59e69865d..99ebea2e72d 100644 --- a/js/js.translator/testData/box/incremental/exportedPackage.kt +++ b/js/js.translator/testData/box/incremental/exportedPackage.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1282 // FILE: a.kt package foo.bar diff --git a/js/js.translator/testData/box/incremental/functionReferencingClass.kt b/js/js.translator/testData/box/incremental/functionReferencingClass.kt index 7b80d7c3e92..4148cb96856 100644 --- a/js/js.translator/testData/box/incremental/functionReferencingClass.kt +++ b/js/js.translator/testData/box/incremental/functionReferencingClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1285 // FILE: A.kt diff --git a/js/js.translator/testData/box/incremental/inline.kt b/js/js.translator/testData/box/incremental/inline.kt index 898117825c1..3e5def259e1 100644 --- a/js/js.translator/testData/box/incremental/inline.kt +++ b/js/js.translator/testData/box/incremental/inline.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1280 // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/inlineLambda.kt b/js/js.translator/testData/box/incremental/inlineLambda.kt index ef1499a25a8..eb47bf8db3f 100644 --- a/js/js.translator/testData/box/incremental/inlineLambda.kt +++ b/js/js.translator/testData/box/incremental/inlineLambda.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1283 // FILE: a.kt inline fun foo(f: () -> String): () -> String { diff --git a/js/js.translator/testData/box/incremental/multipleExport.kt b/js/js.translator/testData/box/incremental/multipleExport.kt index 63b92853c9b..087c73400b8 100644 --- a/js/js.translator/testData/box/incremental/multipleExport.kt +++ b/js/js.translator/testData/box/incremental/multipleExport.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1281 // PROPERTY_WRITE_COUNT: name=foo_61zpoe$ count=1 // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/multipleReimport.kt b/js/js.translator/testData/box/incremental/multipleReimport.kt index b50e53dbdb3..a877e47092c 100644 --- a/js/js.translator/testData/box/incremental/multipleReimport.kt +++ b/js/js.translator/testData/box/incremental/multipleReimport.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1286 // MODULE: lib1 // FILE: lib1.kt diff --git a/js/js.translator/testData/box/incremental/packagesWithSameName.kt b/js/js.translator/testData/box/incremental/packagesWithSameName.kt index c61f66f6860..7e4834183e2 100644 --- a/js/js.translator/testData/box/incremental/packagesWithSameName.kt +++ b/js/js.translator/testData/box/incremental/packagesWithSameName.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1283 // MODULE: lib // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/simple.kt b/js/js.translator/testData/box/incremental/simple.kt index 003188a5239..6dd864072f5 100644 --- a/js/js.translator/testData/box/incremental/simple.kt +++ b/js/js.translator/testData/box/incremental/simple.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1283 // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt b/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt index 4f2a32935e2..bc83eec42bf 100644 --- a/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt +++ b/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1282 // SOURCE_MAP_EMBED_SOURCES: ALWAYS // FILE: a.kt diff --git a/js/js.translator/testData/box/incremental/syntheticStatement.kt b/js/js.translator/testData/box/incremental/syntheticStatement.kt index bf8c2132796..6cbb2b47e39 100644 --- a/js/js.translator/testData/box/incremental/syntheticStatement.kt +++ b/js/js.translator/testData/box/incremental/syntheticStatement.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JS_IR // EXPECTED_REACHABLE_NODES: 1282 // FILE: a.kt