azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js.tests: change paths to kotlin-stdlib-js.klib

Browse Source 
Change the expected klib name of stdlib

KT-56106
This commit is contained in:
Ilya Gorbunov
2023-03-22 05:29:10 +01:00
committed by Space Team
parent 34720f27d4
commit 69a87efdd9
16 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/build.gradle.kts
-1
View File
@@ -43,7 +43,6 @@ sourceSets {
projectTest(parallel = true) {
workingDir = rootDir
dependsOn(":kotlin-stdlib-js-ir:packFullRuntimeKLib")
useJsIrBoxTests(version = version, buildDir = "$buildDir/")
}
compiler/testData/cli/js/fir.args
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ $TEMP_DIR$
-ir-output-name
fir
-libraries
libraries/stdlib/js-ir/build/classes/kotlin/js/main
libraries/stdlib/build/classes/kotlin/js/main
compiler/testData/cli/js/firLightTreeOn.args
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ $TEMP_DIR$
-ir-output-name
fir
-libraries
libraries/stdlib/js-ir/build/classes/kotlin/js/main
libraries/stdlib/build/classes/kotlin/js/main
compiler/testData/cli/js/firMpp.args
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ $TEMP_DIR$
firMpp
-XXLanguage\:+MultiPlatformProjects
-libraries
libraries/stdlib/js-ir/build/classes/kotlin/js/main
libraries/stdlib/build/classes/kotlin/js/main
compiler/testData/cli/js/firMppWithKlib.args
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ firMppWithKlib
-XXLanguage\:+MultiPlatformProjects
-Xir-produce-klib-file=true
-libraries
libraries/stdlib/js-ir/build/classes/kotlin/js/main
libraries/stdlib/build/classes/kotlin/js/main
compiler/testData/cli/js/successfulHmpp.args
Vendored
+1 -1
View File
@@ -15,4 +15,4 @@ fir-hmpp
-Xfragment-refines=b\:a
-Xfragment-refines=c\:b
-libraries
libraries/stdlib/js-ir/build/classes/kotlin/js/main
libraries/stdlib/build/classes/kotlin/js/main
compiler/tests-against-klib/build.gradle.kts
+1 -1
View File
@@ -23,7 +23,7 @@ sourceSets {
testsJar {}
projectTest(parallel = true) {
dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
dependsOn(":kotlin-stdlib:jsJar")
workingDir = rootDir
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
}
compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt
+1 -1
View File
@@ -78,7 +78,7 @@ abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTes
listOf(
"-output", klibName,
"-Xir-produce-klib-file",
"-libraries", "libraries/stdlib/js-ir/build/classes/kotlin/js/main/"
"-libraries", "libraries/stdlib/build/classes/kotlin/js/main/"
) + sourceFiles
)
if (exitCode != ExitCode.OK) {
compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt
+1 -1
View File
@@ -240,7 +240,7 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
return result.getFullList(TopologicalLibraryOrder)
}
private val runtimeKlibPath = "libraries/stdlib/js-ir/build/classes/kotlin/js/main"
private val runtimeKlibPath = "libraries/stdlib/build/classes/kotlin/js/main"
private fun buildFragmentAndLinkIt(stdlib: KotlinLibrary, ignoreErrors: Boolean, expectActualSymbols: MutableMap<DeclarationDescriptor, IrSymbol>): Pair<IrModuleFragment, BindingContext> {
return generateIrModule(stdlib, ignoreErrors, expectActualSymbols)
compiler/tests/org/jetbrains/kotlin/klib/FilePathsInKlibTest.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
return psiManager.findDirectory(vDirectory)?.files?.map { it as KtFile } ?: error("Cannot load KtFiles")
}
private val runtimeKlibPath = "libraries/stdlib/js-ir/build/classes/kotlin/js/main"
private val runtimeKlibPath = "libraries/stdlib/build/classes/kotlin/js/main"
private fun analyseKtFiles(configuration: CompilerConfiguration, ktFiles: List<KtFile>): ModulesStructure {
return prepareAnalyzedSourceModule(