[Gradle, JS] Migrate JS cli tests to ir backend

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()
             }
         }
     }

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
+-Xir-produce-klib-dir
--meta-info
+-Xir-only
--output
+-ir-output-dir
-$TEMP_DIR$/jslib-example.js
+$TEMP_DIR$
+-ir-output-name
+jslib-example
+-libraries
+$STDLIB_JS$

compiler/testData/cli/js/createMetadata.test

@@ -1,3 +1 @@
-// EXISTS: jslib-example.meta.js
+// EXISTS: default/manifest
-// EXISTS: jslib-example.js
-// EXISTS: jslib-example/library/sample/sample.kjsm

compiler/testData/cli/js/folderAsLib/LibraryExample.js

@@ -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);

compiler/testData/cli/js/folderAsLib/LibraryExample.meta.js

@@ -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==");

compiler/testData/cli/js/folderAsLib/default/linkdata/module

@@ -0,0 +1,2 @@
+
+<LibraryExample>:library.sample

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

compiler/testData/cli/js/inlineCycle.args

@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/inlineCycle.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$

compiler/testData/cli/js/inlineCycle.kt

@@ -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()
-}

compiler/testData/cli/js/inlineCycle.out

@@ -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

compiler/testData/cli/js/languageVersion.args

@@ -1,6 +1,11 @@
 $TESTDATA_DIR$/languageVersion.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
--output
+-Xir-only
-$TEMP_DIR$/out.js
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out
 -language-version
 1.4
+-libraries
+$STDLIB_JS$

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.

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
+$STDLIB_JS$:not/existing/path
--output
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

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

compiler/testData/cli/js/moduleWithMetadataOnlyDependency.args

@@ -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

compiler/testData/cli/js/moduleWithMetadataOnlyDependency.out

@@ -1 +0,0 @@
-OK

compiler/testData/cli/js/moduleWithMetadataOnlyDependency.test

@@ -1,5 +0,0 @@
-// EXISTS: m1/m1.meta.js
-// ABSENT: m1/m1.js
-// EXISTS: m1/m1/m1/m1.kjsm
-
-// EXISTS: m2/m2.js

compiler/testData/cli/js/modulesWithSameNames.args

@@ -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

compiler/testData/cli/js/modulesWithSameNames.out

@@ -1,2 +0,0 @@
-warning: module "m" depends on module with the same name
-OK

compiler/testData/cli/js/modulesWithSameNames.test

@@ -1 +0,0 @@
-// NOT_CONTAINS: m2/m.js, foo(bar$lambda);

compiler/testData/cli/js/modulesWithSameNamesAndFunc.args

@@ -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

compiler/testData/cli/js/modulesWithSameNamesAndFunc.out

@@ -1,2 +0,0 @@
-warning: module "m" depends on module with the same name
-OK

compiler/testData/cli/js/modulesWithSameNamesAndFunc.test

@@ -1 +0,0 @@
-// NOT_CONTAINS: m4/m.js, foofaa();

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
+$STDLIB_JS$:compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib
--output
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/notValidLibraryDir.out

@@ -1,8 +1,2 @@
-warning: 'compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib' is not a valid Kotlin Javascript library
+error: could not find "compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib" in [$USER_DIR$]
-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)
-            ^
 COMPILATION_ERROR

compiler/testData/cli/js/outputIsDirectory.args

@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TESTDATA_DIR$

compiler/testData/cli/js/outputIsDirectory.out

@@ -1,2 +0,0 @@
-error: cannot open output file '$TESTDATA_DIR$': is a directory
-COMPILATION_ERROR

compiler/testData/cli/js/outputIsDirectory.test

@@ -1 +0,0 @@
-// ABSENT: out.js

compiler/testData/cli/js/outputPostfixFileNotFound.args

@@ -1,6 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
--output-postfix
-not/existing/path

compiler/testData/cli/js/outputPostfixFileNotFound.out

@@ -1,2 +0,0 @@
-error: output postfix file 'not/existing/path' not found
-COMPILATION_ERROR

compiler/testData/cli/js/outputPostfixFileNotFound.test

@@ -1 +0,0 @@
-// ABSENT: out.js

compiler/testData/cli/js/outputPrefixFileNotFound.args

@@ -1,6 +0,0 @@
-$TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
--output
-$TEMP_DIR$/out.js
--output-prefix
-not/existing/path

compiler/testData/cli/js/outputPrefixFileNotFound.out

@@ -1,2 +0,0 @@
-error: output prefix file 'not/existing/path' not found
-COMPILATION_ERROR

compiler/testData/cli/js/outputPrefixFileNotFound.test

@@ -1 +0,0 @@
-// ABSENT: out.js

compiler/testData/cli/js/reifiedIntersectionType.args

@@ -1,4 +1,9 @@
 $TESTDATA_DIR$/reifiedIntersectionType.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
--output
+-Xir-only
-$TEMP_DIR$/out.js
+-libraries
+$STDLIB_JS$
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/separateModules/sepModule1.kt

@@ -1,6 +0,0 @@
-package m1
-
-inline fun foo(action: () -> Int): Int {
-    return action()
-}
-

compiler/testData/cli/js/separateModules/sepModule2.kt

@@ -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"
-}

compiler/testData/cli/js/separateModules/sepModule3.kt

@@ -1,10 +0,0 @@
-package m3
-
-
-fun foofaa(): Unit { }
-
-inline fun foo(action: () -> Int): Int {
-    foofaa()
-    return action()
-}
-

compiler/testData/cli/js/separateModules/sepModule4.kt

@@ -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"
-}

compiler/testData/cli/js/simple2js.args

@@ -1,4 +1,9 @@
 $TESTDATA_DIR$/simple2js.kt
--Xforce-deprecated-legacy-compiler-usage
+-Xir-produce-klib-dir
--output
+-Xir-only
-$TEMP_DIR$/out.js
+-libraries
+$STDLIB_JS$
+-ir-output-dir
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/simple2js.test

@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMap.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMapCharEscape.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

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

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMapEmbedSources.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMapPrefix.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
--output
+$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out
-$TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
+-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
+-ir-output-dir
-$TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
+$TESTDATA_DIR$/sourceMapRelativeRoot/main/out
+-ir-output-name
+main

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

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"

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMapRootAuto.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/sourceMapRootManual.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out
+

compiler/testData/cli/js/sourceMapRootMissing.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out
+

compiler/testData/cli/js/sourceMapRootMultiple.out

@@ -1 +1,4 @@
+info: produce executable: $TMP_DIR$
+info: cache directory: null
+info: executable production duration: [time]
 OK

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
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

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
+$STDLIB_JS$:$TESTDATA_DIR$/folderAsLib
--output
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/withFolderAsLib.test

@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest

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
+$STDLIB_JS$:$TESTDATA_DIR$/lib/LibraryExample.klib
--output
+-ir-output-dir
-$TEMP_DIR$/out.js
+$TEMP_DIR$
+-ir-output-name
+out

compiler/testData/cli/js/withLib.test

@@ -1 +1 @@
-// EXISTS: out.js
+// EXISTS: default/manifest

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()
                 );
     }
 

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\$")
     }
 

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");

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",
+            "-libraries",
-            "-output",
+            PathUtil.kotlinPathsForCompiler.jsStdLibJarPath.absolutePath,
-            File(tmpdir, "out.js").path,
+            "-Xir-produce-klib-dir",
+            "-Xir-only",
+            "-ir-output-dir",
+            tmpdir.path,
+            "-ir-output-name",
+            "out",
             environment = mapOf("JAVA_HOME" to KtTestUtil.getJdk8Home().absolutePath)
         )
     }

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")
             )

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
         )
     }
 }

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)
     }
 }