From 6963c81b40587ebd32d5ceb253578559955ee091 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 16 Jan 2020 12:33:54 +0300 Subject: [PATCH] Run tests in kotlin-gradle-plugin in repository working dir Unify with other modules and make GradleNodeModuleBuilderTest work under JPS. --- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 2 ++ .../kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 14172c33e85..b93f4a92351 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -144,6 +144,8 @@ tasks { projectTest { executable = "${rootProject.extra["JDK_18"]!!}/bin/java" dependsOn(tasks.named("validateTaskProperties")) + + workingDir = rootDir } pluginBundle { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt index 5a7464e28b0..51c92101230 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt @@ -16,7 +16,7 @@ class GradleNodeModuleBuilderTest { @Test fun validPackageJsonWithoutDependencies() { val packageJson = fromSrcPackageJson( - File("src/test/resources/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest/package.json") + File("libraries/tools/kotlin-gradle-plugin/src/test/resources/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest/package.json") ) assertNotNull(packageJson, "package.json should be deserialized")