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

[Build] Fix xerces usage in FIR modularized tests

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/build.gradle.kts
+3 -2
View File
@@ -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"))
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
+1 -2
View File
@@ -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
}