From ac30911497f6f4a3831042fad9f554b60a7300ca Mon Sep 17 00:00:00 2001 From: Alexander Korepanov Date: Tue, 9 Jan 2024 15:47:34 +0100 Subject: [PATCH] [JS tests] Split FIR and IR output test dirs --- .../kotlin/incremental/FirAbstractInvalidationTest.kt | 4 ++-- .../org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt | 8 ++++---- .../org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt index 2c9754fb453..110803d47a4 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/incremental/FirAbstractInvalidationTest.kt @@ -36,9 +36,9 @@ abstract class AbstractJsFirES6InvalidationPerFileTest : abstract class AbstractJsFirES6InvalidationPerModuleTest : FirAbstractInvalidationTest(TargetBackend.JS_IR_ES6, JsGenerationGranularity.PER_MODULE, "incrementalOut/invalidationFirES6/perModule") abstract class AbstractJsFirInvalidationPerFileWithPLTest : - AbstractJsFirInvalidationWithPLTest(JsGenerationGranularity.PER_FILE, "incrementalOut/invalidationWithPL/perFile") + AbstractJsFirInvalidationWithPLTest(JsGenerationGranularity.PER_FILE, "incrementalOut/invalidationFirWithPL/perFile") abstract class AbstractJsFirInvalidationPerModuleWithPLTest : - AbstractJsFirInvalidationWithPLTest(JsGenerationGranularity.PER_MODULE, "incrementalOut/invalidationWithPL/perModule") + AbstractJsFirInvalidationWithPLTest(JsGenerationGranularity.PER_MODULE, "incrementalOut/invalidationFirWithPL/perModule") abstract class AbstractJsFirInvalidationWithPLTest(granularity: JsGenerationGranularity, workingDirPath: String) : FirAbstractInvalidationTest( diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt index 3c1e40cb8e9..7c8ef9b527e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt @@ -137,7 +137,7 @@ open class AbstractFirJsCodegenInlineTest : AbstractFirJsTest( // TODO: implement separate expectations for FIR/JS to reuse testdata, disabled for now //open class AbstractJsFirLineNumberTest : AbstractFirJsTest( // pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/lineNumbers/", -// testGroupOutputDirPrefix = "irLineNumbers/" +// testGroupOutputDirPrefix = "firLineNumbers/" //) { // override fun configure(builder: TestConfigurationBuilder) { // super.configure(builder) @@ -147,7 +147,7 @@ open class AbstractFirJsCodegenInlineTest : AbstractFirJsTest( open class AbstractFirJsSteppingTest : AbstractFirJsTest( pathToTestDir = "compiler/testData/debug/stepping/", - testGroupOutputDirPrefix = "debug/stepping/" + testGroupOutputDirPrefix = "debug/firStepping/" ) { override fun TestConfigurationBuilder.configuration() { commonConfigurationForJsBlackBoxCodegenTest() @@ -164,6 +164,6 @@ open class AbstractFirJsSteppingTest : AbstractFirJsTest( } open class AbstractFirJsCodegenWasmJsInteropTest : AbstractFirJsTest( - pathToTestDir = "compiler/testData/codegen/wasmJsInterop", - testGroupOutputDirPrefix = "codegen/wasmJsInteropJs" + pathToTestDir = "compiler/testData/codegen/wasmJsInterop/", + testGroupOutputDirPrefix = "codegen/firWasmJsInteropJs/" ) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt index 4e59a6a2d78..723d8442606 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt @@ -209,7 +209,7 @@ private fun configureJsIrLineNumberTest(builder: TestConfigurationBuilder) { open class AbstractIrJsSteppingTest : AbstractJsIrTest( pathToTestDir = "compiler/testData/debug/stepping/", - testGroupOutputDirPrefix = "debug/stepping/" + testGroupOutputDirPrefix = "debug/irStepping/" ) { override fun TestConfigurationBuilder.configuration() { commonConfigurationForJsBlackBoxCodegenTest() @@ -244,6 +244,6 @@ open class AbstractIrJsLocalVariableTest : AbstractJsIrTest( } open class AbstractIrCodegenWasmJsInteropJsTest : AbstractJsIrTest( - pathToTestDir = "compiler/testData/codegen/wasmJsInterop", - testGroupOutputDirPrefix = "codegen/wasmJsInteropJs" -) \ No newline at end of file + pathToTestDir = "compiler/testData/codegen/wasmJsInterop/", + testGroupOutputDirPrefix = "codegen/irWasmJsInteropJs/" +)