From 91bccad72bd8c07aca046a190288a3ca10a49186 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 1 Dec 2020 13:06:38 +0300 Subject: [PATCH] [JS] Fix path of generated js tests --- .../org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt | 4 ++-- .../org/jetbrains/kotlin/js/test/DceTestGenerated.java | 0 .../jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java | 0 .../kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java | 0 .../js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java | 0 .../test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java | 0 .../es6/semantics/IrJsTypeScriptExportES6TestGenerated.java | 0 .../kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java | 0 .../test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java | 0 .../js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java | 0 .../js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java | 0 .../test/ir/semantics/IrJsTypeScriptExportTestGenerated.java | 0 .../kotlin/js/test/semantics/BoxJsTestGenerated.java | 0 .../kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java | 0 .../js/test/semantics/JsCodegenInlineTestGenerated.java | 0 .../semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java | 0 .../test/semantics/LegacyJsTypeScriptExportTestGenerated.java | 0 .../js/test/semantics/OutputPrefixPostfixTestGenerated.java | 0 .../test/semantics/SourceMapGenerationSmokeTestGenerated.java | 0 .../js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/DceTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/es6/semantics/IrJsTypeScriptExportES6TestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/ir/semantics/IrJsTypeScriptExportTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/LegacyJsTypeScriptExportTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java (100%) rename js/js.tests/{test-gen => tests-gen}/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java (100%) diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index b4cdfcb891d..e341e544492 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -21,7 +21,7 @@ fun main(args: Array) { //generateTestDataForReservedWords() testGroupSuite(args) { - testGroup("js/js.tests/test-gen", "js/js.translator/testData", testRunnerMethodName = "runTest0") { + testGroup("js/js.tests/tests-gen", "js/js.translator/testData", testRunnerMethodName = "runTest0") { testClass { model("box/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.JS) } @@ -64,7 +64,7 @@ fun main(args: Array) { } } - testGroup("js/js.tests/test-gen", "compiler/testData", testRunnerMethodName = "runTest0") { + testGroup("js/js.tests/tests-gen", "compiler/testData", testRunnerMethodName = "runTest0") { testClass { model("codegen/box", targetBackend = TargetBackend.JS) } diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/DceTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/DceTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/DceTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/DceTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLineNumberTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsTypeScriptExportES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsTypeScriptExportES6TestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsTypeScriptExportES6TestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsTypeScriptExportES6TestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsTypeScriptExportTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsTypeScriptExportTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsTypeScriptExportTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsTypeScriptExportTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsLegacyPrimitiveArraysBoxTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/LegacyJsTypeScriptExportTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/LegacyJsTypeScriptExportTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/LegacyJsTypeScriptExportTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/LegacyJsTypeScriptExportTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java diff --git a/js/js.tests/test-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java similarity index 100% rename from js/js.tests/test-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java