[Build] Fix xerces usage in FIR modularized tests

This commit is contained in:
Simon Ogorodnik
2021-07-08 20:04:33 +03:00
committed by Space
parent c3a5a7754d
commit e102bdea20
3 changed files with 14 additions and 4 deletions
@@ -16,13 +16,14 @@ repositories {
dependencies {
testCompileOnly(intellijDep()) {
includeJars("extensions", "idea_rt", "util", "asm-all", "platform-util-ex", "jna", rootProject = rootProject)
includeJars("extensions", "idea_rt", "util", "asm-all", "jna", rootProject = rootProject)
}
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") }
testRuntimeOnly(intellijPluginDep("java"))
testRuntimeOnly("xerces:xercesImpl:2.12.0")
testRuntimeOnly(intellijDep())
testRuntimeOnly(intellijPluginDep("java"))
testApi(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import com.intellij.util.io.delete
import org.jetbrains.kotlin.cli.common.*
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
@@ -242,7 +241,7 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
val resultTime = manager.reportCumulativeTime()
PerformanceCounter.resetAllCounters()
tmp.delete(recursively = true)
tmp.toFile().deleteRecursively()
if (result == ExitCode.OK) {
totalPassResult += resultTime
}
+10
View File
@@ -16402,6 +16402,11 @@
<sha256 value="9aa9dfeb2e85e1d5e7932c87140697cecc2b0fadd933d679fd420a2e43831a82" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="xerces" name="xercesImpl" version="2.12.0">
<artifact name="xercesImpl-2.12.0.jar">
<sha256 value="b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="xerces" name="xercesImpl" version="2.9.1">
<artifact name="xercesImpl-2.9.1.jar">
<md5 value="da09b75b562ca9a8e9a535d2148be8e4" origin="Generated by Gradle"/>
@@ -16418,6 +16423,11 @@
<sha256 value="b7f5911d1f3ccf9f78feacb4be3f27f09d5901808e85e993f5d94b2d47ab22c1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="xml-apis" name="xml-apis" version="1.4.01">
<artifact name="xml-apis-1.4.01.jar">
<sha256 value="a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="xml-resolver" name="xml-resolver" version="1.2">
<artifact name="xml-resolver-1.2.jar">
<md5 value="706c533146c1f4ee46b66659ea14583a" origin="Generated by Gradle"/>