From ebb1ca7cd9c0e2571830019bd2ac6a072ae8b4d5 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 18 Dec 2019 12:09:56 +0300 Subject: [PATCH] Fix 'fir:lightTree' build script to be able to run light tree tests --- compiler/fir/lightTree/build.gradle.kts | 26 +++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/compiler/fir/lightTree/build.gradle.kts b/compiler/fir/lightTree/build.gradle.kts index 0cb0bd49fa5..bdbcee166e6 100644 --- a/compiler/fir/lightTree/build.gradle.kts +++ b/compiler/fir/lightTree/build.gradle.kts @@ -15,14 +15,24 @@ repositories { } dependencies { - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compile(project(":compiler:psi")) compile(project(":compiler:fir:tree")) compile(project(":compiler:fir:psi2fir")) - testCompile("junit", "junit", "4.4") + compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + + testCompile(intellijDep()) + + testCompile(commonDep("junit:junit")) + testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) + testCompileOnly(project(":kotlin-test:kotlin-test-junit")) + testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:fir:psi2fir")) + testCompileOnly(project(":kotlin-reflect-api")) + testRuntime(project(":kotlin-reflect")) + testRuntime(project(":core:descriptors.runtime")) + compile("org.openjdk.jmh", "jmh-core", jmhVersion) compile("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion) compile("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion) @@ -71,12 +81,12 @@ val jmhBytecode by tasks.registering(JavaExec::class) { ) } -tasks { - compileTestJava { - source(fileTree("${project.buildDir}/generated-sources/jmh/")) - destinationDir = file("${project.buildDir}/generated-classes/jmh/") - } -} +//tasks { +// compileTestJava { +// source(fileTree("${project.buildDir}/generated-sources/jmh/")) +// destinationDir = file("${project.buildDir}/generated-classes/jmh/") +// } +//} val jmhCompile by tasks.registering(JavaCompile::class) { /*classpath = sourceSets["test"].runtimeClasspath + files("${project.buildDir}/generated-sources/jmh/")