From 148d8c9246710824a83a0c236b4272e6e67edece Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 5 Jul 2023 07:10:06 +0000
Subject: [PATCH] [Gradle, JS] Migrate JS cli tests to ir backend

---
 .../jetbrains/kotlin/ir/backend/js/klib.kt    |   2 +-
 compiler/testData/cli/js/createMetadata.args  |  12 +++--
 compiler/testData/cli/js/createMetadata.test  |   4 +-
 .../cli/js/folderAsLib/LibraryExample.js      |  44 ------------------
 .../cli/js/folderAsLib/LibraryExample.meta.js |   1 -
 .../LibraryExample/library/sample/sample.kjsm | Bin 432 -> 0 bytes
 .../cli/js/folderAsLib/default/ir/bodies.knb  | Bin 0 -> 1617 bytes
 .../js/folderAsLib/default/ir/debugInfo.knd   | Bin 0 -> 98 bytes
 .../cli/js/folderAsLib/default/ir/files.knf   | Bin 0 -> 117 bytes
 .../folderAsLib/default/ir/irDeclarations.knd | Bin 0 -> 612 bytes
 .../js/folderAsLib/default/ir/signatures.knt  | Bin 0 -> 771 bytes
 .../cli/js/folderAsLib/default/ir/strings.knt | Bin 0 -> 647 bytes
 .../cli/js/folderAsLib/default/ir/types.knt   | Bin 0 -> 115 bytes
 .../js/folderAsLib/default/linkdata/module    |   2 +
 .../package_library.sample/0_sample.knm       | Bin 0 -> 448 bytes
 .../cli/js/folderAsLib/default/manifest       |   8 ++++
 compiler/testData/cli/js/inlineCycle.args     |   4 --
 compiler/testData/cli/js/inlineCycle.kt       |  20 --------
 compiler/testData/cli/js/inlineCycle.out      |   7 ---
 compiler/testData/cli/js/languageVersion.args |  11 +++--
 .../testData/cli/js/lib/LibraryExample.jar    | Bin 2967 -> 0 bytes
 .../testData/cli/js/lib/LibraryExample.klib   | Bin 0 -> 4960 bytes
 compiler/testData/cli/js/lib/ReadMe.md        |   2 +-
 .../testData/cli/js/libraryDirNotFound.args   |  11 +++--
 .../testData/cli/js/libraryDirNotFound.out    |   2 +-
 .../js/moduleWithMetadataOnlyDependency.args  |  13 ------
 .../js/moduleWithMetadataOnlyDependency.out   |   1 -
 .../js/moduleWithMetadataOnlyDependency.test  |   5 --
 .../testData/cli/js/modulesWithSameNames.args |  12 -----
 .../testData/cli/js/modulesWithSameNames.out  |   2 -
 .../testData/cli/js/modulesWithSameNames.test |   1 -
 .../cli/js/modulesWithSameNamesAndFunc.args   |  12 -----
 .../cli/js/modulesWithSameNamesAndFunc.out    |   2 -
 .../cli/js/modulesWithSameNamesAndFunc.test   |   1 -
 .../testData/cli/js/notValidLibraryDir.args   |  11 +++--
 .../testData/cli/js/notValidLibraryDir.out    |   8 +---
 .../testData/cli/js/outputIsDirectory.args    |   4 --
 .../testData/cli/js/outputIsDirectory.out     |   2 -
 .../testData/cli/js/outputIsDirectory.test    |   1 -
 .../cli/js/outputPostfixFileNotFound.args     |   6 ---
 .../cli/js/outputPostfixFileNotFound.out      |   2 -
 .../cli/js/outputPostfixFileNotFound.test     |   1 -
 .../cli/js/outputPrefixFileNotFound.args      |   6 ---
 .../cli/js/outputPrefixFileNotFound.out       |   2 -
 .../cli/js/outputPrefixFileNotFound.test      |   1 -
 .../cli/js/reifiedIntersectionType.args       |  11 +++--
 .../cli/js/separateModules/sepModule1.kt      |   6 ---
 .../cli/js/separateModules/sepModule2.kt      |  13 ------
 .../cli/js/separateModules/sepModule3.kt      |  10 ----
 .../cli/js/separateModules/sepModule4.kt      |  17 -------
 compiler/testData/cli/js/simple2js.args       |  11 +++--
 compiler/testData/cli/js/simple2js.test       |   2 +-
 compiler/testData/cli/js/sourceMap.args       |  11 +++--
 compiler/testData/cli/js/sourceMap.out        |   3 ++
 .../testData/cli/js/sourceMapCharEscape.args  |  11 +++--
 .../testData/cli/js/sourceMapCharEscape.out   |   3 ++
 .../js/sourceMapDuplicateRelativePaths.args   |  11 +++--
 .../js/sourceMapDuplicateRelativePaths.out    |   4 +-
 .../cli/js/sourceMapEmbedSources.args         |  11 +++--
 .../testData/cli/js/sourceMapEmbedSources.out |   3 ++
 compiler/testData/cli/js/sourceMapPrefix.args |  11 +++--
 compiler/testData/cli/js/sourceMapPrefix.out  |   3 ++
 .../cli/js/sourceMapRelativeRoot.args         |  23 +++++----
 .../testData/cli/js/sourceMapRelativeRoot.out |   3 ++
 .../cli/js/sourceMapRelativeRoot.test         |   2 -
 .../testData/cli/js/sourceMapRootAuto.args    |  11 +++--
 .../testData/cli/js/sourceMapRootAuto.out     |   3 ++
 .../testData/cli/js/sourceMapRootManual.args  |  11 +++--
 .../testData/cli/js/sourceMapRootManual.out   |   3 ++
 .../testData/cli/js/sourceMapRootMissing.args |  12 +++--
 .../testData/cli/js/sourceMapRootMissing.out  |   3 ++
 .../cli/js/sourceMapRootMultiple.args         |  12 +++--
 .../testData/cli/js/sourceMapRootMultiple.out |   3 ++
 .../cli/js/suppressAllWarningsJS.args         |  11 +++--
 compiler/testData/cli/js/withFolderAsLib.args |  11 +++--
 compiler/testData/cli/js/withFolderAsLib.test |   2 +-
 compiler/testData/cli/js/withLib.args         |  11 +++--
 compiler/testData/cli/js/withLib.test         |   2 +-
 .../jetbrains/kotlin/cli/AbstractCliTest.java |  19 +++++++-
 .../AbstractKotlinCompilerIntegrationTest.kt  |   7 ++-
 .../kotlin/cli/CliTestGenerated.java          |  35 --------------
 .../kotlin/cli/LauncherScriptTest.kt          |  15 ++++--
 .../compiler/JavaModulesIntegrationTest.kt    |   2 +-
 .../konan/blackboxtest/CompilerOutputTest.kt  |   4 +-
 .../kotlin/importsDumper/ImportsDumperTest.kt |   2 +-
 85 files changed, 243 insertions(+), 328 deletions(-)
 delete mode 100644 compiler/testData/cli/js/folderAsLib/LibraryExample.js
 delete mode 100644 compiler/testData/cli/js/folderAsLib/LibraryExample.meta.js
 delete mode 100644 compiler/testData/cli/js/folderAsLib/LibraryExample/library/sample/sample.kjsm
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/bodies.knb
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/debugInfo.knd
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/files.knf
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/irDeclarations.knd
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/signatures.knt
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/strings.knt
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/ir/types.knt
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/linkdata/module
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/linkdata/package_library.sample/0_sample.knm
 create mode 100644 compiler/testData/cli/js/folderAsLib/default/manifest
 delete mode 100644 compiler/testData/cli/js/inlineCycle.args
 delete mode 100644 compiler/testData/cli/js/inlineCycle.kt
 delete mode 100644 compiler/testData/cli/js/inlineCycle.out
 delete mode 100644 compiler/testData/cli/js/lib/LibraryExample.jar
 create mode 100644 compiler/testData/cli/js/lib/LibraryExample.klib
 delete mode 100644 compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args
 delete mode 100644 compiler/testData/cli/js/moduleWithMetadataOnlyDependency.out
 delete mode 100644 compiler/testData/cli/js/moduleWithMetadataOnlyDependency.test
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNames.args
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNames.out
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNames.test
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNamesAndFunc.args
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNamesAndFunc.out
 delete mode 100644 compiler/testData/cli/js/modulesWithSameNamesAndFunc.test
 delete mode 100644 compiler/testData/cli/js/outputIsDirectory.args
 delete mode 100644 compiler/testData/cli/js/outputIsDirectory.out
 delete mode 100644 compiler/testData/cli/js/outputIsDirectory.test
 delete mode 100644 compiler/testData/cli/js/outputPostfixFileNotFound.args
 delete mode 100644 compiler/testData/cli/js/outputPostfixFileNotFound.out
 delete mode 100644 compiler/testData/cli/js/outputPostfixFileNotFound.test
 delete mode 100644 compiler/testData/cli/js/outputPrefixFileNotFound.args
 delete mode 100644 compiler/testData/cli/js/outputPrefixFileNotFound.out
 delete mode 100644 compiler/testData/cli/js/outputPrefixFileNotFound.test
 delete mode 100644 compiler/testData/cli/js/separateModules/sepModule1.kt
 delete mode 100644 compiler/testData/cli/js/separateModules/sepModule2.kt
 delete mode 100644 compiler/testData/cli/js/separateModules/sepModule3.kt
 delete mode 100644 compiler/testData/cli/js/separateModules/sepModule4.kt

diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
index 1b6e2d0175c..2175ca63fe1 100644
--- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
+++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
@@ -111,7 +111,7 @@ val CompilerConfiguration.resolverLogger: Logger
 
             override fun fatal(message: String): Nothing {
                 messageLogger.report(IrMessageLogger.Severity.ERROR, message, null)
-                kotlin.error("FATAL ERROR: $message")
+                throw CompilationErrorException()
             }
         }
     }
diff --git a/compiler/testData/cli/js/createMetadata.args b/compiler/testData/cli/js/createMetadata.args
index 0ff1318ca8c..3ad1e6917a8 100644
--- a/compiler/testData/cli/js/createMetadata.args
+++ b/compiler/testData/cli/js/createMetadata.args
@@ -1,5 +1,9 @@
 compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
--Xforce-deprecated-legacy-compiler-usage
--meta-info
--output
-$TEMP_DIR$/jslib-example.js
+-Xir-produce-klib-dir
+-Xir-only
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+jslib-example
+-libraries
+$STDLIB_JS$
\ No newline at end of file
diff --git a/compiler/testData/cli/js/createMetadata.test b/compiler/testData/cli/js/createMetadata.test
index f2ef15728f1..ab6a6915d81 100644
--- a/compiler/testData/cli/js/createMetadata.test
+++ b/compiler/testData/cli/js/createMetadata.test
@@ -1,3 +1 @@
-// EXISTS: jslib-example.meta.js
-// EXISTS: jslib-example.js
-// EXISTS: jslib-example/library/sample/sample.kjsm
+// EXISTS: default/manifest
\ No newline at end of file
diff --git a/compiler/testData/cli/js/folderAsLib/LibraryExample.js b/compiler/testData/cli/js/folderAsLib/LibraryExample.js
deleted file mode 100644
index 68154be1e35..00000000000
--- a/compiler/testData/cli/js/folderAsLib/LibraryExample.js
+++ /dev/null
@@ -1,44 +0,0 @@
-if (typeof kotlin === 'undefined') {
-  throw new Error("Error loading module 'LibraryExample'. Its dependency 'kotlin' was not found. Please, check whether 'kotlin' is loaded prior to 'LibraryExample'.");
-}
-var LibraryExample = function (_, Kotlin) {
-  'use strict';
-  function pairAdd(p) {
-    return p.first + p.second | 0;
-  }
-  function pairMul(p) {
-    return Kotlin.imul(p.first, p.second);
-  }
-  function IntHolder(value) {
-    this.value = value;
-  }
-  IntHolder.$metadata$ = {
-    kind: Kotlin.Kind.CLASS,
-    simpleName: 'IntHolder',
-    interfaces: []
-  };
-  IntHolder.prototype.component1 = function () {
-    return this.value;
-  };
-  IntHolder.prototype.copy_za3lpa$ = function (value) {
-    return new IntHolder(value === void 0 ? this.value : value);
-  };
-  IntHolder.prototype.toString = function () {
-    return 'IntHolder(value=' + Kotlin.toString(this.value) + ')';
-  };
-  IntHolder.prototype.hashCode = function () {
-    var result = 0;
-    result = result * 31 + Kotlin.hashCode(this.value) | 0;
-    return result;
-  };
-  IntHolder.prototype.equals = function (other) {
-    return this === other || (other !== null && (typeof other === 'object' && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))));
-  };
-  var package$library = _.library || (_.library = {});
-  var package$sample = package$library.sample || (package$library.sample = {});
-  package$sample.pairAdd_1fzo63$ = pairAdd;
-  package$sample.pairMul_1fzo63$ = pairMul;
-  package$sample.IntHolder = IntHolder;
-  Kotlin.defineModule('LibraryExample', _);
-  return _;
-}(typeof LibraryExample === 'undefined' ? {} : LibraryExample, kotlin);
diff --git a/compiler/testData/cli/js/folderAsLib/LibraryExample.meta.js b/compiler/testData/cli/js/folderAsLib/LibraryExample.meta.js
deleted file mode 100644
index 5dd2ffc566e..00000000000
--- a/compiler/testData/cli/js/folderAsLib/LibraryExample.meta.js
+++ /dev/null
@@ -1 +0,0 @@
-// Kotlin.kotlin_module_metadata(1, "LibraryExample", "H4sIAAAAAAAAAJVW227TQBB1fF1Pb64LJTUgRBEgbiWkCIEESC19KJWQgIoPcJ1tsqmzG9ZO0v4Ar0h9QP2UfAGf0N+BcS5O0tRu6gfvaHdmzlzOjq2490FxFa94Rv4Nn0LXHsmnRHE9sMD49oOz2NVBdRTPPCNK11aSs4cwD+aRiEPGQWXChUQBdKI4hUQNffVcvIabqZol6WFIgxjUeuQ6I318Fxw1sVK7tjp0rtf9tg96K2ZhlvOXsJo6n6fHTSpZg/LYzzToBV3/2aLyBNQWy1J7BzdAE7IKWmczAK0iGqAFUeSuXowZ36qjJaZa19YS0yfgpCGZ0udVGmWh7MNGqgqBkAJT5TSazASA8VgyHrFgJvwNWBoP/bgm8yv9CBbSIJJEr1OSlgxnCakIRs90mkO3gQzbMX34AGCEmBXWxhi95gLRaPqSRYJn1vw5rKT6dkQRmgfZHXqBSacdakqBbYlZtvqFYMKE6ywnmAn3IwLkXaVeQayjmhRcRGB06EE1zG/wZY2L2tVZGvcebl00NWkbaTkTEycGRD0zqx4H+mrTHNgcq1AP3zhosbCSn/FTWJ4aOVnobyZSnMMGHwrZ8JEU+RjPwE0xCN5QKnn21NmC9asvej7ebw3+FMAK2YH0cXaZkd9ohhTszzzeFWGFylGZtvgJGG0/bFHQ8DhBbDQFR5BXoAeiidbIez+MwNoWIqQ+B0PENXRBan5U+yQqFEgs9pOpUwVzsFpNn8mtSgUKTdC/otzf+dIK3Y9jgZtJ4EUFdzSUNUdHOVnNwQqDdXGwLhcVb8e76yx5askou47jLbq6i3L/XSJdouCxm3Pcr/M6I79IUS2rJX2buKZjJBZ7tmMl6+5fbW/FISiqZYI8NfqbBdy0UTTLxJnz9GKhpO+ea2g03zs/L6C4gKKF4veBSwQ8JSpMDdpkdM7OygMpOhGVWYR5C2tjvhe4iNkhC/z+MMlFKSHKyNI4pHFQy7d4DIuTUyUrqERxmIAe0+PMOzXxSam3Mz8pd8BOGT199T9A8eLwQcbJCMk4y/Qp46AfmVsdIY+ovGbxWEivsFgDs/+fMh3/Dty79MdnbFzMkMbEJ8LnyIQeCzJK6g1U/wOSAB0W3QkAAA==");
diff --git a/compiler/testData/cli/js/folderAsLib/LibraryExample/library/sample/sample.kjsm b/compiler/testData/cli/js/folderAsLib/LibraryExample/library/sample/sample.kjsm
deleted file mode 100644
index f53578c8ac0ac1a628c156f0bcb52b8f6bd937d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmaKnK~BRk5JhdraV7&46E;yKHXHzj8~~}nB2+>`a01g<G{TKTnj-ZA9DoJlC_O=s
z(DN{Dv&NGBpZ?b$jTvJBV~o??ADxX{{o0vsb+s__)>-`F7!4Mx!HXZ7zVxoL9jbTV
zySl+(+^jJCG;V1zpcrxL=dEvS(_f>U`gVoNek_e!V07!fv!=n&_cIy+Gqaf8`N|^n
z{-y8g<_*=LQETdMTvf<hluyLCcOI86xj~^BN?@9!0<J~M$O(u8Es1xk2E{=~gPx@<
zyU#B4X(sZpNHl#rkqPnP&0!6U;^d$B7x+5nmo<DrDhiRyTS$}+ca2G`qn(zUU~;a3
tP!s^-5SANGW=y6kKp$l?<+&`k0hNyTr7b5sA&kl`e;!8CKHnga{Q<5vPNx6>

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/bodies.knb b/compiler/testData/cli/js/folderAsLib/default/ir/bodies.knb
new file mode 100644
index 0000000000000000000000000000000000000000..0a81e515810bee384315cf9a719c796f5adb9c53
GIT binary patch
literal 1617
zcmbVM-AhzK6rZ!MdN`p@lOOB!;d<RjR;|U4G$<&uG|Nn}G6d<%Oo$?*gdTF-wuts2
z!VJ7b;A0U!^wNtDy%rHY6oC%~J@-d+_QPgYcOl~PV`k1h=lp)>%(+(x0Ya1<6GCia
zTxZNM+8B~?fHB5sVw`6zGp2<IEaPIto1#fv@bpC*^I;T)8leGw91W=+s-uvuMpLdT
zsEkVDP=tw~gwT9ATqZ^6U0Bzzxu|t6-!m?+yfCrnVnhZ)3m(2mfOnH_;QKh}DZ1dp
zIGRdzj)wFgnvm+FdaBhmDMCr*S;A^2d~P7k_{)H9SaVYAoZ|6}(;HqDlQJ2zG8KNF
z2d{;yQmd|@((YoM^OTUm5F4m6ZDzK|T;4;SwPGBKF|k8xPPCE)WO$v_ky`a0+T}w8
zO;puU&2$xQ!TXImD>vCJi&6oZFy>DMe|`Ne{ham&X~3TJA!_p>hGw^FqV3aLsWz3U
zGE;Xl#)<w0ayq*Y*!{+^_CjHn*BhZ>d(ua#%ZCm$ttv)dJWz*o+oaHZ@syR4*qcM|
z%5tRGjNTH^OQ&l66etcp%%bU1cj?+&m?A~N*1)L-S?tu3u|;xhc^b37P=(o~JKY31
z`}}IJ&}FM#k5a!6y=V@qZfe)9XnIr&<x$aHNJUPs@-r?K(~{etXFv~N73P3ut&-?1
z>ZN_U6V0%S*~>_taEYxwaZ;ArUWS`xi9M-C(mwEa)u+-umf*hSA+@s=w0piYt480U
ztE(_Um#iszHr1Dppb=%!+SumGaA`J(5boQ8B8DuXI?{ibHshla*<w|Oh5Ug!D+CG(
zafX(DyLJ5p`og{c1oXi%M^}KJ0P*kU9-1?1hHlfOo<K9I#&zCt$hj4F1oFCb363Dw
UJsfkpl6(5k4z}A4>VF=DKmBbgSO5S3

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/debugInfo.knd b/compiler/testData/cli/js/folderAsLib/default/ir/debugInfo.knd
new file mode 100644
index 0000000000000000000000000000000000000000..1fbc5685498b778464433904e5f558272ed6cc52
GIT binary patch
literal 98
zcmZQzU|?imV2A=@5FO;^>FVR65D?@a;2IPX8Smui?Ct629uE=DOUzBRDoe~MO;sqV
tEJ(G=&M(Qy%+vGCD^V!REY3{I%*iaNv??gdEK4j&RftZ@%uCFP1pt(t9cBOk

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/files.knf b/compiler/testData/cli/js/folderAsLib/default/ir/files.knf
new file mode 100644
index 0000000000000000000000000000000000000000..e5ae5257418a24b82262776c3eddec63a8d920e8
GIT binary patch
literal 117
zcmV~$F%H5o3;;kIwn$yNfOtgx3D{T|kjm&p5tuqn<V2`_3OoqD#T@`303^2s*Y)0A
z=vt#y5?y(?=Q%vs@{25%TxrTpWu}l*5sgMI)^_B^6jbP0NyXDyys@pPg;UWuOs(%=
Qw;ykB{NNXVc-R2`0rP|;7XSbN

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/irDeclarations.knd b/compiler/testData/cli/js/folderAsLib/default/ir/irDeclarations.knd
new file mode 100644
index 0000000000000000000000000000000000000000..a48b88ee10a27045bf3c75376adc4fa46f87c03f
GIT binary patch
literal 612
zcmZXQK}!Nb7=~xZ&BiZ{udU1$$xTgUk+7*`h>D01BQZL334cUCVWVXaS%)Y(bnVt}
zsBY1%L+Ht05cMPac3l$P9p1yd^FHr<vy3r~G2Uj3#Yp~FCKX6PIwGx*QlxW={>o*@
zK|(N$WqJ!%9CbMjAY7gHA4!X0S}|FGW%8Uk@|+#YID8OFlkrsvLYna%gQW0GvOe!L
z%M&<jB20-+8)e`y>~q^T%TR)pxX4oO?S^s=$44&xq`O4kOGl%=Tdug>+G<kcbun~3
z9p_Dha+hUX3~~nLGO>IKisU*rW&<~l?>ryeT>0<obEVsxavj#d5Y8&*GTrB1uud(H
zW0&XCFe5ru0)_|vz-q#7$T}R*sUt_QI9`bXwGpADKc-s?uje$T6<3qCk~OIMO=_em
zjZb0IcBDxOgFCxJa&L^h56S%~nIN)mpU7i4^dH?AAs;xthG;W_O8;lLtug;cD4@zS
Gsfj<l<Coq5

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/signatures.knt b/compiler/testData/cli/js/folderAsLib/default/ir/signatures.knt
new file mode 100644
index 0000000000000000000000000000000000000000..02f9413ed20f2f52353fe873ad55481f57d2fd53
GIT binary patch
literal 771
zcmY*WU279T6rGtS+0C@Ho88o0T98phOI3pY0w4TCKKmlJK18VoT1vFV%|kWSfFTb;
zjI|_+t&OyOuqA#JBMAlRVwTWa{7&b#Ga)`4?%i|GopZQL2%&_q--M93L{!3*V5(y8
zC|IgSWJMinu!bcD)i>&qLl_bv3Eb0KtXivk?WgyU*Ph7fIr7-+ebiu&m2sOhLT$>x
z&n;GdZu{?3l!rJC*fc1J>I_v)9>EC<hN1l_ld5hf>X#K|^upuCQroTXHljoQX2|M;
z#Otp=TBW_IQ(DpwZ~y(BdNe-KzB)8un$`fUuO+vhWpB<@sm@`+-PvN+TWZ!GQi1HD
zUj)9bUHdS-|0YwT+&D_?aObdLP82p8wapu2<wSuBrm`MWyRj&IpB=yR{9gK9Ub`@7
z5d7O450>Y?tPEcaatc631Ey^`GP-RI!;4aVB3ZoUo)<kT7;}z8GVAUwWOmX_1UlXV
zmOkf;AIqNWQV|rP&fo;>&$qqYWV5-W4|-A<I@EvDqhG+B(@<ESUoLF^$;3tH)Lo>y
zW2~FfyJw*4tt>owHIuuf4lp9Zf~!6zWAy|^&)W1HG$w!TrqY#4o{C=e;z%4;y_eT3
a)8*Ecj`9MGJ#B6I{{6x#)y`cmqVE7}C$f70

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/strings.knt b/compiler/testData/cli/js/folderAsLib/default/ir/strings.knt
new file mode 100644
index 0000000000000000000000000000000000000000..af152b59a7b62ba794e0c5d72f92e0d58e7c77c8
GIT binary patch
literal 647
zcmYL_O^?$s5Qf9@{c%A8B*cvq9FRa<OC%?m7K<bePP$^bSf(*sYh63UE~qE|Iy2d3
zQS@ZSuV>z|og~SvBsu$=B*{nQK639A=lnLVu_n25(kT*mk;ljrgnB4a59!qN5Fwq`
zR8Jbk7szXbdS4<`^9Xr`(EbBt)+o~KS)2W7eRisQj`0~n{!~vMPp$bes__`qez1B_
zW@LR|z>?QcT={5?<1P*j>a~wM<1Pn#2u-<Zf0{AG#ifq#rYv1SCmXSDKy(*DZ@ufM
z&FeHJ<LY3e+3QekO7#5fZLi0LaVDm}l|ASUX3QNI*)pAdWXAF@yk5yAhqB-`?>H;@
zceoiOmttMXh6z?d2V$BynWcCIwkiJ~NwPeLwq1(_-Xf%1zaPBQE`C@+4T5!0$bxlD
z<|S)eSwWS7*!tlZeH%x-_Vxef+;65SpWg0N*yX<0`qx3(ka=&la`;dhd!inlvSx&@
y^l>3OsG7B4;zFJ?!C6*9+z;>NR4)IRxRYBIBDTY~ygYT)ZO7^yq<|dwIf#EMYnxaA

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/ir/types.knt b/compiler/testData/cli/js/folderAsLib/default/ir/types.knt
new file mode 100644
index 0000000000000000000000000000000000000000..2fe2519b7531c572d8fe4233e498e39d72c4a66c
GIT binary patch
literal 115
zcmZQzU|?imV8{kyP9SCnVs0o6Vq;(}R)IDq2_`L0fi^Y?CM70DMvw>xPy|RxK_~?X
SWd)(UAXI<^14v1L1QP&nLkcDU

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/linkdata/module b/compiler/testData/cli/js/folderAsLib/default/linkdata/module
new file mode 100644
index 00000000000..9481cde84c3
--- /dev/null
+++ b/compiler/testData/cli/js/folderAsLib/default/linkdata/module
@@ -0,0 +1,2 @@
+
+<LibraryExample>:library.sample
\ No newline at end of file
diff --git a/compiler/testData/cli/js/folderAsLib/default/linkdata/package_library.sample/0_sample.knm b/compiler/testData/cli/js/folderAsLib/default/linkdata/package_library.sample/0_sample.knm
new file mode 100644
index 0000000000000000000000000000000000000000..4b9f353d2dab8bed2820c13539f8f77f6385807d
GIT binary patch
literal 448
zcmYk2!A`<J6h%Aj%yhVjKI*1n>53IW;-V`PFea5~V)P3tG(sqyT8fdKiHZN>kMIe^
zC2N<gTspKYTujcqd*{BFdH7;*vuK+4$79HuE|O^q=O!({GVpt2pm{re%A<UB{T9u$
zB<{?LDsi_=;3ky^xhPH4Of=NVIL_hp(-p*Plq_Rlr01DV<Fq&jAL(ob8NV!}WC3@e
zbrMG@gf1o~r6$p0a;3*HRG}Y>e40K(R`f1m6N6M1*}heh8`|W8D~FU(IMogg4m>&V
z)VEp}tp-^=PEMNz))vB)@?W`Q1iQ-s&$Qp4uKf*u_QBMr@|fj|f%G`l+iVCr3Rt*y
zOpl>Qjh<BYUJvYW&Gs76vFS@~9ysBqd<ANn#HMsXULdObgG=?0z1PK#wajc;&bPb5
Z(0s~grJ{Zzwy=J1eAsrUTJ{c1`~d<2UDN;o

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/folderAsLib/default/manifest b/compiler/testData/cli/js/folderAsLib/default/manifest
new file mode 100644
index 00000000000..83b51236624
--- /dev/null
+++ b/compiler/testData/cli/js/folderAsLib/default/manifest
@@ -0,0 +1,8 @@
+abi_version=1.8.0
+builtins_platform=JS
+compiler_version=1.9.255-SNAPSHOT
+depends=kotlin
+metadata_version=1.4.1
+serializedIrFileFingerprints=3vriludieft1x.1583499ndbss7
+serializedKlibFingerprint=3f3efqjuxw1sw.xi1rrqn6iire
+unique_name=LibraryExample
diff --git a/compiler/testData/cli/js/inlineCycle.args b/compiler/testData/cli/js/inlineCycle.args
deleted file mode 100644
index a257d8f8a2b..00000000000
--- a/compiler/testData/cli/js/inlineCycle.args
+++ /dev/null
@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/inlineCycle.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$
diff --git a/compiler/testData/cli/js/inlineCycle.kt b/compiler/testData/cli/js/inlineCycle.kt
deleted file mode 100644
index 09fc245f430..00000000000
--- a/compiler/testData/cli/js/inlineCycle.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-inline fun a(l: () -> Unit) {
-    b(l)
-
-    //check that nested not recognized as cycle
-    c {
-        c {
-
-        }
-    }
-}
-
-
-inline fun b(p: () -> Unit) {
-    p()
-    a(p)
-}
-
-inline fun c(p: () -> Unit) {
-    p()
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/js/inlineCycle.out b/compiler/testData/cli/js/inlineCycle.out
deleted file mode 100644
index f0b7956570f..00000000000
--- a/compiler/testData/cli/js/inlineCycle.out
+++ /dev/null
@@ -1,7 +0,0 @@
-compiler/testData/cli/js/inlineCycle.kt:2:5: error: the 'b' invocation is a part of inline cycle
-    b(l)
-    ^
-compiler/testData/cli/js/inlineCycle.kt:15:5: error: the 'a' invocation is a part of inline cycle
-    a(p)
-    ^
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/languageVersion.args b/compiler/testData/cli/js/languageVersion.args
index 952a7d4927c..d3887d33689 100644
--- a/compiler/testData/cli/js/languageVersion.args
+++ b/compiler/testData/cli/js/languageVersion.args
@@ -1,6 +1,11 @@
 $TESTDATA_DIR$/languageVersion.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
+-Xir-produce-klib-dir
+-Xir-only
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
 -language-version
 1.4
+-libraries
+$STDLIB_JS$
diff --git a/compiler/testData/cli/js/lib/LibraryExample.jar b/compiler/testData/cli/js/lib/LibraryExample.jar
deleted file mode 100644
index 8f4c227bcb97895ae6c27f9a0af5a84b0c30f962..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2967
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

diff --git a/compiler/testData/cli/js/lib/LibraryExample.klib b/compiler/testData/cli/js/lib/LibraryExample.klib
new file mode 100644
index 0000000000000000000000000000000000000000..fedbeb4bb8ece49713befe2309aa8a88631ed7fa
GIT binary patch
literal 4960
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
O<&#P|T+I|40N`KS0j?qd

literal 0
HcmV?d00001

diff --git a/compiler/testData/cli/js/lib/ReadMe.md b/compiler/testData/cli/js/lib/ReadMe.md
index b419e48b014..42c46cd0bed 100644
--- a/compiler/testData/cli/js/lib/ReadMe.md
+++ b/compiler/testData/cli/js/lib/ReadMe.md
@@ -1,5 +1,5 @@
 # jslib
 
-Path to sources: `compiler/testData/cli/js/jslib`
+Path to sources: `compiler/testData/cli/js/lib`
 
 `folderAsLib/LibraryExample.js`, `folderAsLib/LibraryExample.meta.js` and `LibraryExample.jar` should be updated after changing some files in source folder.
\ No newline at end of file
diff --git a/compiler/testData/cli/js/libraryDirNotFound.args b/compiler/testData/cli/js/libraryDirNotFound.args
index 9c78073345c..bdd503368a7 100644
--- a/compiler/testData/cli/js/libraryDirNotFound.args
+++ b/compiler/testData/cli/js/libraryDirNotFound.args
@@ -1,6 +1,9 @@
 $TESTDATA_DIR$/withLib.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
 -libraries
-not/existing/path
--output
-$TEMP_DIR$/out.js
+$STDLIB_JS$:not/existing/path
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/libraryDirNotFound.out b/compiler/testData/cli/js/libraryDirNotFound.out
index 3f4e3e154fc..36b11e5f7ec 100644
--- a/compiler/testData/cli/js/libraryDirNotFound.out
+++ b/compiler/testData/cli/js/libraryDirNotFound.out
@@ -1,2 +1,2 @@
-error: path 'not/existing/path' does not exist
+error: could not find "not/existing/path" in [$USER_DIR$]
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args b/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args
deleted file mode 100644
index 093152029ec..00000000000
--- a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args
+++ /dev/null
@@ -1,13 +0,0 @@
-$TESTDATA_DIR$/separateModules/sepModule1.kt
--Xforce-deprecated-legacy-compiler-usage
--meta-info
--Xmetadata-only
--output
-$TEMP_DIR$/m1/m1.js
----
-$TESTDATA_DIR$/separateModules/sepModule2.kt
--Xforce-deprecated-legacy-compiler-usage
--libraries
-$TEMP_DIR$/m1
--output
-$TEMP_DIR$/m2/m2.js
\ No newline at end of file
diff --git a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.out b/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.test b/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.test
deleted file mode 100644
index cafe8620ea5..00000000000
--- a/compiler/testData/cli/js/moduleWithMetadataOnlyDependency.test
+++ /dev/null
@@ -1,5 +0,0 @@
-// EXISTS: m1/m1.meta.js
-// ABSENT: m1/m1.js
-// EXISTS: m1/m1/m1/m1.kjsm
-
-// EXISTS: m2/m2.js
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNames.args b/compiler/testData/cli/js/modulesWithSameNames.args
deleted file mode 100644
index 35cf4831c08..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNames.args
+++ /dev/null
@@ -1,12 +0,0 @@
-$TESTDATA_DIR$/separateModules/sepModule1.kt
--Xforce-deprecated-legacy-compiler-usage
--meta-info
--output
-$TEMP_DIR$/m1/m.js
----
-$TESTDATA_DIR$/separateModules/sepModule2.kt
--Xforce-deprecated-legacy-compiler-usage
--libraries
-$TEMP_DIR$/m1
--output
-$TEMP_DIR$/m2/m.js
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNames.out b/compiler/testData/cli/js/modulesWithSameNames.out
deleted file mode 100644
index 7dbb3f33ebf..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNames.out
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: module "m" depends on module with the same name
-OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNames.test b/compiler/testData/cli/js/modulesWithSameNames.test
deleted file mode 100644
index 2f49dae589c..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNames.test
+++ /dev/null
@@ -1 +0,0 @@
-// NOT_CONTAINS: m2/m.js, foo(bar$lambda);
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.args b/compiler/testData/cli/js/modulesWithSameNamesAndFunc.args
deleted file mode 100644
index 7dc5ce5c209..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.args
+++ /dev/null
@@ -1,12 +0,0 @@
-$TESTDATA_DIR$/separateModules/sepModule3.kt
--Xforce-deprecated-legacy-compiler-usage
--meta-info
--output
-$TEMP_DIR$/m3/m.js
----
-$TESTDATA_DIR$/separateModules/sepModule4.kt
--Xforce-deprecated-legacy-compiler-usage
--libraries
-$TEMP_DIR$/m3
--output
-$TEMP_DIR$/m4/m.js
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.out b/compiler/testData/cli/js/modulesWithSameNamesAndFunc.out
deleted file mode 100644
index 7dbb3f33ebf..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.out
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: module "m" depends on module with the same name
-OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.test b/compiler/testData/cli/js/modulesWithSameNamesAndFunc.test
deleted file mode 100644
index 04e189486b6..00000000000
--- a/compiler/testData/cli/js/modulesWithSameNamesAndFunc.test
+++ /dev/null
@@ -1 +0,0 @@
-// NOT_CONTAINS: m4/m.js, foofaa();
\ No newline at end of file
diff --git a/compiler/testData/cli/js/notValidLibraryDir.args b/compiler/testData/cli/js/notValidLibraryDir.args
index bf09f1c03b1..23836c19e49 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.args
+++ b/compiler/testData/cli/js/notValidLibraryDir.args
@@ -1,6 +1,9 @@
 $TESTDATA_DIR$/withLib.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
 -libraries
-compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib
--output
-$TEMP_DIR$/out.js
+$STDLIB_JS$:compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/notValidLibraryDir.out b/compiler/testData/cli/js/notValidLibraryDir.out
index 82ff68be02e..bc9c7acc419 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.out
+++ b/compiler/testData/cli/js/notValidLibraryDir.out
@@ -1,8 +1,2 @@
-warning: 'compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib' is not a valid Kotlin Javascript library
-compiler/testData/cli/js/withLib.kt:2:8: error: unresolved reference: library
-import library.sample.*
-       ^
-compiler/testData/cli/js/withLib.kt:6:13: error: unresolved reference: pairAdd
-    val x = pairAdd(p)
-            ^
+error: could not find "compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib" in [$USER_DIR$]
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/outputIsDirectory.args b/compiler/testData/cli/js/outputIsDirectory.args
deleted file mode 100644
index 8c5df02ff33..00000000000
--- a/compiler/testData/cli/js/outputIsDirectory.args
+++ /dev/null
@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TESTDATA_DIR$
diff --git a/compiler/testData/cli/js/outputIsDirectory.out b/compiler/testData/cli/js/outputIsDirectory.out
deleted file mode 100644
index e08cc42ef6f..00000000000
--- a/compiler/testData/cli/js/outputIsDirectory.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: cannot open output file '$TESTDATA_DIR$': is a directory
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/outputIsDirectory.test b/compiler/testData/cli/js/outputIsDirectory.test
deleted file mode 100644
index 8c8bba65ee6..00000000000
--- a/compiler/testData/cli/js/outputIsDirectory.test
+++ /dev/null
@@ -1 +0,0 @@
-// ABSENT: out.js
diff --git a/compiler/testData/cli/js/outputPostfixFileNotFound.args b/compiler/testData/cli/js/outputPostfixFileNotFound.args
deleted file mode 100644
index 5b2eb1dbd24..00000000000
--- a/compiler/testData/cli/js/outputPostfixFileNotFound.args
+++ /dev/null
@@ -1,6 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
--output-postfix
-not/existing/path
diff --git a/compiler/testData/cli/js/outputPostfixFileNotFound.out b/compiler/testData/cli/js/outputPostfixFileNotFound.out
deleted file mode 100644
index 414fd079cba..00000000000
--- a/compiler/testData/cli/js/outputPostfixFileNotFound.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: output postfix file 'not/existing/path' not found
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/outputPostfixFileNotFound.test b/compiler/testData/cli/js/outputPostfixFileNotFound.test
deleted file mode 100644
index 8c8bba65ee6..00000000000
--- a/compiler/testData/cli/js/outputPostfixFileNotFound.test
+++ /dev/null
@@ -1 +0,0 @@
-// ABSENT: out.js
diff --git a/compiler/testData/cli/js/outputPrefixFileNotFound.args b/compiler/testData/cli/js/outputPrefixFileNotFound.args
deleted file mode 100644
index 50e437dd1b4..00000000000
--- a/compiler/testData/cli/js/outputPrefixFileNotFound.args
+++ /dev/null
@@ -1,6 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
--output-prefix
-not/existing/path
diff --git a/compiler/testData/cli/js/outputPrefixFileNotFound.out b/compiler/testData/cli/js/outputPrefixFileNotFound.out
deleted file mode 100644
index ff4ddabc7b3..00000000000
--- a/compiler/testData/cli/js/outputPrefixFileNotFound.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: output prefix file 'not/existing/path' not found
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/outputPrefixFileNotFound.test b/compiler/testData/cli/js/outputPrefixFileNotFound.test
deleted file mode 100644
index 8c8bba65ee6..00000000000
--- a/compiler/testData/cli/js/outputPrefixFileNotFound.test
+++ /dev/null
@@ -1 +0,0 @@
-// ABSENT: out.js
diff --git a/compiler/testData/cli/js/reifiedIntersectionType.args b/compiler/testData/cli/js/reifiedIntersectionType.args
index 8c8f871fd96..753dabf5b73 100644
--- a/compiler/testData/cli/js/reifiedIntersectionType.args
+++ b/compiler/testData/cli/js/reifiedIntersectionType.args
@@ -1,4 +1,9 @@
 $TESTDATA_DIR$/reifiedIntersectionType.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
+-Xir-produce-klib-dir
+-Xir-only
+-libraries
+$STDLIB_JS$
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/separateModules/sepModule1.kt b/compiler/testData/cli/js/separateModules/sepModule1.kt
deleted file mode 100644
index 886c695c407..00000000000
--- a/compiler/testData/cli/js/separateModules/sepModule1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package m1
-
-inline fun foo(action: () -> Int): Int {
-    return action()
-}
-
diff --git a/compiler/testData/cli/js/separateModules/sepModule2.kt b/compiler/testData/cli/js/separateModules/sepModule2.kt
deleted file mode 100644
index d1e0d9f9c42..00000000000
--- a/compiler/testData/cli/js/separateModules/sepModule2.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package m2
-
-import m1.*
-
-fun bar(): Int {
-    foo { return 100 }
-    return -99
-}
-
-fun box(): String {
-    if (bar() == 100) return "OK"
-    return "fail"
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/js/separateModules/sepModule3.kt b/compiler/testData/cli/js/separateModules/sepModule3.kt
deleted file mode 100644
index f4f303a5ebb..00000000000
--- a/compiler/testData/cli/js/separateModules/sepModule3.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package m3
-
-
-fun foofaa(): Unit { }
-
-inline fun foo(action: () -> Int): Int {
-    foofaa()
-    return action()
-}
-
diff --git a/compiler/testData/cli/js/separateModules/sepModule4.kt b/compiler/testData/cli/js/separateModules/sepModule4.kt
deleted file mode 100644
index 5781d2cfeb0..00000000000
--- a/compiler/testData/cli/js/separateModules/sepModule4.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package m4
-
-import m3.*
-
-inline fun foo(action: () -> Int): Int {
-    return action()
-}
-
-fun bar(): Int {
-    foo { return 100 }
-    return -99
-}
-
-fun box(): String {
-    if (bar() == 100) return "OK"
-    return "fail"
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/js/simple2js.args b/compiler/testData/cli/js/simple2js.args
index e3dc179f89f..4cbeb53754a 100644
--- a/compiler/testData/cli/js/simple2js.args
+++ b/compiler/testData/cli/js/simple2js.args
@@ -1,4 +1,9 @@
 $TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
+-Xir-produce-klib-dir
+-Xir-only
+-libraries
+$STDLIB_JS$
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/simple2js.test b/compiler/testData/cli/js/simple2js.test
index cc68ed467c9..103cfa3c288 100644
--- a/compiler/testData/cli/js/simple2js.test
+++ b/compiler/testData/cli/js/simple2js.test
@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest
diff --git a/compiler/testData/cli/js/sourceMap.args b/compiler/testData/cli/js/sourceMap.args
index ff6733a4b15..aa073041d2e 100644
--- a/compiler/testData/cli/js/sourceMap.args
+++ b/compiler/testData/cli/js/sourceMap.args
@@ -1,7 +1,12 @@
 $TESTDATA_DIR$/sourceMap.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-prefix
 ./
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMap.out b/compiler/testData/cli/js/sourceMap.out
index d86bac9de59..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMap.out
+++ b/compiler/testData/cli/js/sourceMap.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapCharEscape.args b/compiler/testData/cli/js/sourceMapCharEscape.args
index 92787d2cdf3..291992255d1 100644
--- a/compiler/testData/cli/js/sourceMapCharEscape.args
+++ b/compiler/testData/cli/js/sourceMapCharEscape.args
@@ -1,7 +1,12 @@
 $TESTDATA_DIR$/sourceMapCharEscape.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-embed-sources
 always
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapCharEscape.out b/compiler/testData/cli/js/sourceMapCharEscape.out
index d86bac9de59..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMapCharEscape.out
+++ b/compiler/testData/cli/js/sourceMapCharEscape.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
index ab59ae1e1bd..77625b229d2 100644
--- a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
+++ b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
@@ -1,7 +1,12 @@
 $TESTDATA_DIR$/sourceMapDuplicatePath/
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/sourceMapDuplicatePath/foo:$TESTDATA_DIR$/sourceMapDuplicatePath/bar
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.out b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.out
index a7d9bd4940f..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.out
+++ b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.out
@@ -1,2 +1,4 @@
-warning: there are files with same path 'lib.kt', relative to source roots: '$TESTDATA_DIR$/sourceMapDuplicatePath/foo/lib.kt' and '$TESTDATA_DIR$/sourceMapDuplicatePath/bar/lib.kt'. This will likely cause problems with debugger
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapEmbedSources.args b/compiler/testData/cli/js/sourceMapEmbedSources.args
index ec2fe578094..4e9fc7cc180 100644
--- a/compiler/testData/cli/js/sourceMapEmbedSources.args
+++ b/compiler/testData/cli/js/sourceMapEmbedSources.args
@@ -1,9 +1,14 @@
 $TESTDATA_DIR$/sourceMap.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-prefix
 ./
 -source-map-embed-sources
 always
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapEmbedSources.out b/compiler/testData/cli/js/sourceMapEmbedSources.out
index a0aba9318ad..15a9042e343 100644
--- a/compiler/testData/cli/js/sourceMapEmbedSources.out
+++ b/compiler/testData/cli/js/sourceMapEmbedSources.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/sourceMapPrefix.args b/compiler/testData/cli/js/sourceMapPrefix.args
index 22a548a7717..fc518e49aec 100644
--- a/compiler/testData/cli/js/sourceMapPrefix.args
+++ b/compiler/testData/cli/js/sourceMapPrefix.args
@@ -1,7 +1,12 @@
 $TESTDATA_DIR$/sourceMap.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-prefix
 /localhost/src/
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapPrefix.out b/compiler/testData/cli/js/sourceMapPrefix.out
index d86bac9de59..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMapPrefix.out
+++ b/compiler/testData/cli/js/sourceMapPrefix.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapRelativeRoot.args b/compiler/testData/cli/js/sourceMapRelativeRoot.args
index f1c35306b09..e1557415c22 100644
--- a/compiler/testData/cli/js/sourceMapRelativeRoot.args
+++ b/compiler/testData/cli/js/sourceMapRelativeRoot.args
@@ -1,14 +1,21 @@
 $TESTDATA_DIR$/sourceMapRelativeRoot/lib/src/lib.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
--meta-info
--output
-$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
+-ir-output-dir
+$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out
+-ir-output-name
+lib
 ---
 $TESTDATA_DIR$/sourceMapRelativeRoot/main/src/main.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
 -libraries
-$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/
+$STDLIB_JS$:$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/
 -source-map
--output
-$TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
+-ir-output-dir
+$TESTDATA_DIR$/sourceMapRelativeRoot/main/out
+-ir-output-name
+main
diff --git a/compiler/testData/cli/js/sourceMapRelativeRoot.out b/compiler/testData/cli/js/sourceMapRelativeRoot.out
index d86bac9de59..37986f887ac 100644
--- a/compiler/testData/cli/js/sourceMapRelativeRoot.out
+++ b/compiler/testData/cli/js/sourceMapRelativeRoot.out
@@ -1 +1,4 @@
+info: produce executable: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapRelativeRoot.test b/compiler/testData/cli/js/sourceMapRelativeRoot.test
index e7fd01e82f1..862820e1522 100644
--- a/compiler/testData/cli/js/sourceMapRelativeRoot.test
+++ b/compiler/testData/cli/js/sourceMapRelativeRoot.test
@@ -1,5 +1,3 @@
-// EXISTS: $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
 // EXISTS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
-// CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js.map, "../src/lib.kt"
 // CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js.map, "../src/main.kt"
 // CONTAINS: $TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js.map, "../../lib/src/lib.kt"
diff --git a/compiler/testData/cli/js/sourceMapRootAuto.args b/compiler/testData/cli/js/sourceMapRootAuto.args
index 2ef71242189..8d6f8578120 100644
--- a/compiler/testData/cli/js/sourceMapRootAuto.args
+++ b/compiler/testData/cli/js/sourceMapRootAuto.args
@@ -1,8 +1,13 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-prefix
 ./
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapRootAuto.out b/compiler/testData/cli/js/sourceMapRootAuto.out
index a0aba9318ad..15a9042e343 100644
--- a/compiler/testData/cli/js/sourceMapRootAuto.out
+++ b/compiler/testData/cli/js/sourceMapRootAuto.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/sourceMapRootManual.args b/compiler/testData/cli/js/sourceMapRootManual.args
index e30a49abca3..c6f8ecc8f7b 100644
--- a/compiler/testData/cli/js/sourceMapRootManual.args
+++ b/compiler/testData/cli/js/sourceMapRootManual.args
@@ -1,8 +1,13 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/sourceMapRootManual.out b/compiler/testData/cli/js/sourceMapRootManual.out
index a0aba9318ad..15a9042e343 100644
--- a/compiler/testData/cli/js/sourceMapRootManual.out
+++ b/compiler/testData/cli/js/sourceMapRootManual.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
\ No newline at end of file
diff --git a/compiler/testData/cli/js/sourceMapRootMissing.args b/compiler/testData/cli/js/sourceMapRootMissing.args
index 278e796ffef..5c3dee330bf 100644
--- a/compiler/testData/cli/js/sourceMapRootMissing.args
+++ b/compiler/testData/cli/js/sourceMapRootMissing.args
@@ -2,9 +2,15 @@ $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/baz/file3.kt
 $TESTDATA_DIR$/sourceMapRoot/foo/baz/file4.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/sourceMapRoot/foo
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
+
diff --git a/compiler/testData/cli/js/sourceMapRootMissing.out b/compiler/testData/cli/js/sourceMapRootMissing.out
index d86bac9de59..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMapRootMissing.out
+++ b/compiler/testData/cli/js/sourceMapRootMissing.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/sourceMapRootMultiple.args b/compiler/testData/cli/js/sourceMapRootMultiple.args
index 93d537c8d32..1235e383f7b 100644
--- a/compiler/testData/cli/js/sourceMapRootMultiple.args
+++ b/compiler/testData/cli/js/sourceMapRootMultiple.args
@@ -1,8 +1,14 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-js
+-Xir-only
+-libraries
+$STDLIB_JS$
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/foo:$TESTDATA_DIR$/bar
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
+
diff --git a/compiler/testData/cli/js/sourceMapRootMultiple.out b/compiler/testData/cli/js/sourceMapRootMultiple.out
index d86bac9de59..e4bc79944e6 100644
--- a/compiler/testData/cli/js/sourceMapRootMultiple.out
+++ b/compiler/testData/cli/js/sourceMapRootMultiple.out
@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK
diff --git a/compiler/testData/cli/js/suppressAllWarningsJS.args b/compiler/testData/cli/js/suppressAllWarningsJS.args
index 261fcf75d9d..910af09fc96 100644
--- a/compiler/testData/cli/js/suppressAllWarningsJS.args
+++ b/compiler/testData/cli/js/suppressAllWarningsJS.args
@@ -1,5 +1,10 @@
 $TESTDATA_DIR$/../warnings.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
+-libraries
+$STDLIB_JS$
 -nowarn
--output
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/withFolderAsLib.args b/compiler/testData/cli/js/withFolderAsLib.args
index 840dc4c60a5..0aea7d676ba 100644
--- a/compiler/testData/cli/js/withFolderAsLib.args
+++ b/compiler/testData/cli/js/withFolderAsLib.args
@@ -1,6 +1,9 @@
 $TESTDATA_DIR$/withLib.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
 -libraries
-$TESTDATA_DIR$/folderAsLib
--output
-$TEMP_DIR$/out.js
+$STDLIB_JS$:$TESTDATA_DIR$/folderAsLib
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/withFolderAsLib.test b/compiler/testData/cli/js/withFolderAsLib.test
index cc68ed467c9..103cfa3c288 100644
--- a/compiler/testData/cli/js/withFolderAsLib.test
+++ b/compiler/testData/cli/js/withFolderAsLib.test
@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest
diff --git a/compiler/testData/cli/js/withLib.args b/compiler/testData/cli/js/withLib.args
index 9f53df1a6b1..69ac616e557 100644
--- a/compiler/testData/cli/js/withLib.args
+++ b/compiler/testData/cli/js/withLib.args
@@ -1,6 +1,9 @@
 $TESTDATA_DIR$/withLib.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
+-Xir-only
 -libraries
-$TESTDATA_DIR$/lib/LibraryExample.jar
--output
-$TEMP_DIR$/out.js
+$STDLIB_JS$:$TESTDATA_DIR$/lib/LibraryExample.klib
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
diff --git a/compiler/testData/cli/js/withLib.test b/compiler/testData/cli/js/withLib.test
index cc68ed467c9..103cfa3c288 100644
--- a/compiler/testData/cli/js/withLib.test
+++ b/compiler/testData/cli/js/withLib.test
@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
index d7c2f37f73a..3bbe8075344 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
@@ -84,13 +84,22 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
     }
 
     @NotNull
-    public static String getNormalizedCompilerOutput(@NotNull String pureOutput, @Nullable ExitCode exitCode, @NotNull String testDataDir) {
+    public static String getNormalizedCompilerOutput(
+            @NotNull String pureOutput,
+            @Nullable ExitCode exitCode,
+            @NotNull String testDataDir,
+            @NotNull String tmpdir
+    ) {
         String testDataAbsoluteDir = new File(testDataDir).getAbsolutePath();
+        String tmpDirAbsoluteDir = new File(tmpdir).getAbsolutePath();
         String normalizedOutputWithoutExitCode = StringUtil.convertLineSeparators(pureOutput)
                 .replace(testDataAbsoluteDir, TESTDATA_DIR)
                 .replace(FileUtil.toSystemIndependentName(testDataAbsoluteDir), TESTDATA_DIR)
                 .replace(PathUtil.getKotlinPathsForDistDirectory().getHomePath().getAbsolutePath(), "$PROJECT_DIR$")
                 .replace(PathUtil.getKotlinPathsForDistDirectory().getHomePath().getParentFile().getAbsolutePath(), "$DIST_DIR$")
+                .replace(org.jetbrains.kotlin.konan.file.File.Companion.getUserDir().getAbsolutePath(), "$USER_DIR$")
+                .replace(tmpDirAbsoluteDir, "$TMP_DIR$")
+                .replaceAll("info: executable production duration: \\d+ms", "info: executable production duration: [time]")
                 .replace("expected version is " + JvmMetadataVersion.INSTANCE, "expected version is $ABI_VERSION$")
                 .replace("expected version is " + JsMetadataVersion.INSTANCE, "expected version is $ABI_VERSION$")
                 .replace("compiler version " + JvmMetadataVersion.INSTANCE, "compiler version $ABI_VERSION$")
@@ -115,7 +124,10 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
 
         Pair<String, ExitCode> outputAndExitCode = executeCompilerGrabOutput(compiler, readArgs(fileName, tmpdir.getPath()));
         String actual = getNormalizedCompilerOutput(
-                outputAndExitCode.getFirst(), outputAndExitCode.getSecond(), new File(fileName).getParent()
+                outputAndExitCode.getFirst(),
+                outputAndExitCode.getSecond(),
+                new File(fileName).getParent(),
+                tmpdir.getAbsolutePath()
         );
 
         File outFile = new File(fileName.replaceFirst("\\.args$", ".out"));
@@ -285,6 +297,9 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
                 ).replace(
                         "$JDK_17$",
                         KtTestUtil.getJdk17Home().getPath()
+                ).replace(
+                        "$STDLIB_JS$",
+                        PathUtil.getKotlinPathsForCompiler().getJsStdLibJarPath().getAbsolutePath()
                 );
     }
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractKotlinCompilerIntegrationTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractKotlinCompilerIntegrationTest.kt
index 4d2b8fdeabd..6e8a530a763 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractKotlinCompilerIntegrationTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractKotlinCompilerIntegrationTest.kt
@@ -132,7 +132,12 @@ abstract class AbstractKotlinCompilerIntegrationTest : TestCaseWithTmpdir() {
     }
 
     protected fun normalizeOutput(output: Pair<String, ExitCode>): String {
-        return AbstractCliTest.getNormalizedCompilerOutput(output.first, output.second, testDataDirectory.path).removeFirWarning()
+        return AbstractCliTest.getNormalizedCompilerOutput(
+            output.first,
+            output.second,
+            testDataDirectory.path,
+            tmpdir.absolutePath
+        ).removeFirWarning()
             .replace(FileUtil.toSystemIndependentName(tmpdir.absolutePath), "\$TMP_DIR\$")
     }
 
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index 27187f6bc49..6aa116fd55e 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -1318,11 +1318,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/js/firMppWithKlib.args");
         }
 
-        @TestMetadata("inlineCycle.args")
-        public void testInlineCycle() throws Exception {
-            runTest("compiler/testData/cli/js/inlineCycle.args");
-        }
-
         @TestMetadata("jsExtraHelp.args")
         public void testJsExtraHelp() throws Exception {
             runTest("compiler/testData/cli/js/jsExtraHelp.args");
@@ -1358,21 +1353,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/js/libraryDirNotFound.args");
         }
 
-        @TestMetadata("moduleWithMetadataOnlyDependency.args")
-        public void testModuleWithMetadataOnlyDependency() throws Exception {
-            runTest("compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args");
-        }
-
-        @TestMetadata("modulesWithSameNames.args")
-        public void testModulesWithSameNames() throws Exception {
-            runTest("compiler/testData/cli/js/modulesWithSameNames.args");
-        }
-
-        @TestMetadata("modulesWithSameNamesAndFunc.args")
-        public void testModulesWithSameNamesAndFunc() throws Exception {
-            runTest("compiler/testData/cli/js/modulesWithSameNamesAndFunc.args");
-        }
-
         @TestMetadata("nonExistingKotlinHome.args")
         public void testNonExistingKotlinHome() throws Exception {
             runTest("compiler/testData/cli/js/nonExistingKotlinHome.args");
@@ -1388,21 +1368,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/js/notValidLibraryDir.args");
         }
 
-        @TestMetadata("outputIsDirectory.args")
-        public void testOutputIsDirectory() throws Exception {
-            runTest("compiler/testData/cli/js/outputIsDirectory.args");
-        }
-
-        @TestMetadata("outputPostfixFileNotFound.args")
-        public void testOutputPostfixFileNotFound() throws Exception {
-            runTest("compiler/testData/cli/js/outputPostfixFileNotFound.args");
-        }
-
-        @TestMetadata("outputPrefixFileNotFound.args")
-        public void testOutputPrefixFileNotFound() throws Exception {
-            runTest("compiler/testData/cli/js/outputPrefixFileNotFound.args");
-        }
-
         @TestMetadata("perFileWithValidModuleKind.args")
         public void testPerFileWithValidModuleKind() throws Exception {
             runTest("compiler/testData/cli/js/perFileWithValidModuleKind.args");
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
index 327c1463f76..6abca9be9f1 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
@@ -56,12 +56,12 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
         val stdout =
             AbstractCliTest.getNormalizedCompilerOutput(
                 StringUtil.convertLineSeparators(process.inputStream.bufferedReader().use { it.readText() }),
-                null, testDataDirectory
+                null, testDataDirectory, tmpdir.absolutePath
             )
         val stderr =
             AbstractCliTest.getNormalizedCompilerOutput(
                 StringUtil.convertLineSeparators(process.errorStream.bufferedReader().use { it.readText() }),
-                null, testDataDirectory
+                null, testDataDirectory, tmpdir.absolutePath
             ).replace("Picked up [_A-Z]+:.*\n".toRegex(), "")
                 .replace("The system cannot find the file specified", "No such file or directory") // win -> unix
         process.waitFor(10, TimeUnit.SECONDS)
@@ -145,9 +145,14 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
             "kotlinc-js",
             "$testDataDirectory/emptyMain.kt",
             "-nowarn",
-            "-Xforce-deprecated-legacy-compiler-usage",
-            "-output",
-            File(tmpdir, "out.js").path,
+            "-libraries",
+            PathUtil.kotlinPathsForCompiler.jsStdLibJarPath.absolutePath,
+            "-Xir-produce-klib-dir",
+            "-Xir-only",
+            "-ir-output-dir",
+            tmpdir.path,
+            "-ir-output-name",
+            "out",
             environment = mapOf("JAVA_HOME" to KtTestUtil.getJdk8Home().absolutePath)
         )
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt
index 02ad3ef0d33..c94a1509491 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt
@@ -65,7 +65,7 @@ abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private v
         return { actual ->
             KotlinTestUtils.assertEqualsToFile(
                 expectedFile,
-                getNormalizedCompilerOutput(actual, null, testDataPath)
+                getNormalizedCompilerOutput(actual, null, testDataPath, tmpdir.absolutePath)
                     .replace((System.getenv("JDK_11_0") ?: System.getenv("JDK_11")).replace("\\", "/"), "\$JDK11")
                     .replace((System.getenv("JDK_17_0") ?: System.getenv("JDK_17")).replace("\\", "/"), "\$JDK17")
             )
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt
index 6daf3a24f9d..a8cada50fd5 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt
@@ -88,10 +88,12 @@ class CompilerOutputTest : AbstractNativeSimpleTest() {
     }
 
     private fun normalizeOutput(output: String, exitCode: ExitCode): String {
+        val dir = "compiler/testData/compileKotlinAgainstCustomBinaries/"
         return AbstractCliTest.getNormalizedCompilerOutput(
             output,
             exitCode,
-            "compiler/testData/compileKotlinAgainstCustomBinaries/"
+            dir,
+            dir
         )
     }
 }
diff --git a/plugins/imports-dumper/tests/org/jetbrains/kotlin/importsDumper/ImportsDumperTest.kt b/plugins/imports-dumper/tests/org/jetbrains/kotlin/importsDumper/ImportsDumperTest.kt
index 02a35c5b95e..c5e2703fbdc 100644
--- a/plugins/imports-dumper/tests/org/jetbrains/kotlin/importsDumper/ImportsDumperTest.kt
+++ b/plugins/imports-dumper/tests/org/jetbrains/kotlin/importsDumper/ImportsDumperTest.kt
@@ -64,7 +64,7 @@ class ImportsDumperTest : TestCaseWithTmpdir() {
             )
         )
 
-        return getNormalizedCompilerOutput(output, exitCode, testDataDir.path)
+        return getNormalizedCompilerOutput(output, exitCode, testDataDir.path, tmpDir.absolutePath)
     }
 }