Revert "KT-57927: Fix deserialization of K2JVMCompilerArguments in FP/MT tests"
This reverts commit f8fdfc5d332b171b0e9e410b09a0b1e30d0d510e.
The change should be reverted as original change of the format in the
K2JVMCompilerArguments was reverted by commit:
5d0bf2de24
Merge-request: KT-MR-9684
Merged-by: Simon Ogorodnik <Simon.Ogorodnik@gmail.com>
This commit is contained in:
committed by
Space Team
parent
f29e505bd3
commit
ecf40e5c7a
-34
@@ -149,42 +149,8 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() {
|
|||||||
return modules.map { node -> loadModule(node).also { it.arguments = arguments } }
|
return modules.map { node -> loadModule(node).also { it.arguments = arguments } }
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: remove once support for snapshot 2022 is ended
|
|
||||||
private fun updateCompilerArgumentsXml(element: Element) {
|
|
||||||
fun convertOptionToList(optionElement: Element) {
|
|
||||||
if (optionElement.getAttribute("value") == null) return
|
|
||||||
val paths = optionElement.getAttributeValue("value").split(":")
|
|
||||||
|
|
||||||
optionElement.removeAttribute("value")
|
|
||||||
|
|
||||||
val listElement = Element("list")
|
|
||||||
paths.forEach { path ->
|
|
||||||
val pathElement = Element("option")
|
|
||||||
pathElement.setAttribute("value", path)
|
|
||||||
listElement.addContent(pathElement)
|
|
||||||
}
|
|
||||||
|
|
||||||
optionElement.addContent(listElement)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fun findOptionElements(parentElement: Element, optionName: String): List<Element> {
|
|
||||||
return parentElement.getChildren("option")
|
|
||||||
.filter { it.getAttributeValue("name") == optionName }
|
|
||||||
}
|
|
||||||
|
|
||||||
// See KT-57927
|
|
||||||
findOptionElements(element, "classpath").forEach {
|
|
||||||
convertOptionToList(it)
|
|
||||||
}
|
|
||||||
findOptionElements(element, "pluginClasspath").forEach {
|
|
||||||
convertOptionToList(it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun loadCompilerArguments(argumentsRoot: Element): CommonCompilerArguments? {
|
private fun loadCompilerArguments(argumentsRoot: Element): CommonCompilerArguments? {
|
||||||
val element = argumentsRoot.children.singleOrNull() ?: return null
|
val element = argumentsRoot.children.singleOrNull() ?: return null
|
||||||
updateCompilerArgumentsXml(element)
|
|
||||||
return when (element.name) {
|
return when (element.name) {
|
||||||
"K2JVMCompilerArguments" -> K2JVMCompilerArguments().also { XmlSerializer.deserializeInto(it, element) }
|
"K2JVMCompilerArguments" -> K2JVMCompilerArguments().also { XmlSerializer.deserializeInto(it, element) }
|
||||||
else -> null
|
else -> null
|
||||||
|
|||||||
Reference in New Issue
Block a user