[JS IR BE] Remove workaround to run coroutine tests
This commit is contained in:
@@ -124,7 +124,7 @@ abstract class BasicBoxTest(
|
|||||||
generateJavaScriptFile(
|
generateJavaScriptFile(
|
||||||
file.parent, module, outputFileName, dependencies, friends, modules.size > 1,
|
file.parent, module, outputFileName, dependencies, friends, modules.size > 1,
|
||||||
!SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(),
|
!SKIP_SOURCEMAP_REMAPPING.matcher(fileContent).find(),
|
||||||
outputPrefixFile, outputPostfixFile, mainCallParameters, testPackage, testFunction, coroutinesPackage.isNotEmpty()
|
outputPrefixFile, outputPostfixFile, mainCallParameters, testPackage, testFunction
|
||||||
)
|
)
|
||||||
|
|
||||||
if (!module.name.endsWith(OLD_MODULE_SUFFIX)) Pair(outputFileName, module) else null
|
if (!module.name.endsWith(OLD_MODULE_SUFFIX)) Pair(outputFileName, module) else null
|
||||||
@@ -302,8 +302,7 @@ abstract class BasicBoxTest(
|
|||||||
outputPostfixFile: File?,
|
outputPostfixFile: File?,
|
||||||
mainCallParameters: MainCallParameters,
|
mainCallParameters: MainCallParameters,
|
||||||
testPackage: String?,
|
testPackage: String?,
|
||||||
testFunction: String,
|
testFunction: String
|
||||||
doNotCache: Boolean
|
|
||||||
) {
|
) {
|
||||||
val kotlinFiles = module.files.filter { it.fileName.endsWith(".kt") }
|
val kotlinFiles = module.files.filter { it.fileName.endsWith(".kt") }
|
||||||
val testFiles = kotlinFiles.map { it.fileName }
|
val testFiles = kotlinFiles.map { it.fileName }
|
||||||
@@ -325,7 +324,7 @@ abstract class BasicBoxTest(
|
|||||||
val incrementalData = IncrementalData()
|
val incrementalData = IncrementalData()
|
||||||
translateFiles(
|
translateFiles(
|
||||||
psiFiles.map(TranslationUnit::SourceFile), outputFile, config, outputPrefixFile, outputPostfixFile,
|
psiFiles.map(TranslationUnit::SourceFile), outputFile, config, outputPrefixFile, outputPostfixFile,
|
||||||
mainCallParameters, incrementalData, remap, testPackage, testFunction, doNotCache
|
mainCallParameters, incrementalData, remap, testPackage, testFunction
|
||||||
)
|
)
|
||||||
|
|
||||||
if (module.hasFilesToRecompile) {
|
if (module.hasFilesToRecompile) {
|
||||||
@@ -372,7 +371,7 @@ abstract class BasicBoxTest(
|
|||||||
|
|
||||||
translateFiles(
|
translateFiles(
|
||||||
translationUnits, recompiledOutputFile, recompiledConfig, outputPrefixFile, outputPostfixFile,
|
translationUnits, recompiledOutputFile, recompiledConfig, outputPrefixFile, outputPostfixFile,
|
||||||
mainCallParameters, incrementalData, remap, testPackage, testFunction, false
|
mainCallParameters, incrementalData, remap, testPackage, testFunction
|
||||||
)
|
)
|
||||||
|
|
||||||
val originalOutput = FileUtil.loadFile(outputFile)
|
val originalOutput = FileUtil.loadFile(outputFile)
|
||||||
@@ -436,8 +435,7 @@ abstract class BasicBoxTest(
|
|||||||
incrementalData: IncrementalData,
|
incrementalData: IncrementalData,
|
||||||
remap: Boolean,
|
remap: Boolean,
|
||||||
testPackage: String?,
|
testPackage: String?,
|
||||||
testFunction: String,
|
testFunction: String
|
||||||
doNotCache: Boolean
|
|
||||||
) {
|
) {
|
||||||
val translator = K2JSTranslator(config)
|
val translator = K2JSTranslator(config)
|
||||||
val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters)
|
val translationResult = translator.translateUnits(ExceptionThrowingReporter, units, mainCallParameters)
|
||||||
|
|||||||
@@ -85,8 +85,7 @@ abstract class BasicIrBoxTest(
|
|||||||
incrementalData: IncrementalData,
|
incrementalData: IncrementalData,
|
||||||
remap: Boolean,
|
remap: Boolean,
|
||||||
testPackage: String?,
|
testPackage: String?,
|
||||||
testFunction: String,
|
testFunction: String
|
||||||
doNotCache: Boolean
|
|
||||||
) {
|
) {
|
||||||
val filesToCompile = units
|
val filesToCompile = units
|
||||||
.map { (it as TranslationUnit.SourceFile).file }
|
.map { (it as TranslationUnit.SourceFile).file }
|
||||||
@@ -113,22 +112,12 @@ abstract class BasicIrBoxTest(
|
|||||||
runtimeFile.write(runtimeResult!!.generatedCode)
|
runtimeFile.write(runtimeResult!!.generatedCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
val result = if (doNotCache) {
|
val result = compile(
|
||||||
val runtimeFiles = runtimeSources.map(::createPsiFile)
|
config.project,
|
||||||
val allFiles = runtimeFiles + filesToCompile
|
filesToCompile,
|
||||||
compile(
|
config.configuration,
|
||||||
config.project,
|
FqName((testPackage?.let { "$it." } ?: "") + testFunction),
|
||||||
allFiles,
|
listOf(runtimeResult!!.moduleDescriptor))
|
||||||
runtimeConfiguration,
|
|
||||||
FqName((testPackage?.let { "$it." } ?: "") + testFunction))
|
|
||||||
} else {
|
|
||||||
compile(
|
|
||||||
config.project,
|
|
||||||
filesToCompile,
|
|
||||||
config.configuration,
|
|
||||||
FqName((testPackage?.let { "$it." } ?: "") + testFunction),
|
|
||||||
listOf(runtimeResult!!.moduleDescriptor))
|
|
||||||
}
|
|
||||||
|
|
||||||
outputFile.write(result.generatedCode)
|
outputFile.write(result.generatedCode)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user