Fix test log dir broken by intellij plugin 0.7.3 (#2603)

abrooksv · web-flow · commit fd2b5097ea04 · 2021-05-17T15:04:33.000-07:00
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension.Output
+import org.jetbrains.intellij.Utils
 import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask
 import org.jetbrains.intellij.tasks.RunIdeForUiTestTask
 import software.aws.toolkits.gradle.IdeVersions
@@ -97,7 +98,7 @@ afterEvaluate {
     }
 
     tasks.withType<Test>().all {
-        systemProperty("log.dir", "${intellij.sandboxDirectory}-test/logs")
+        systemProperty("log.dir", "${Utils.stringInput(intellij.sandboxDirectory)}-test/logs")
         systemProperty("testDataPath", project.rootDir.resolve("testdata").absolutePath)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`import org.gradle.testing.jacoco.plugins.JacocoTaskExtension.Output`
	`5`	`+import org.jetbrains.intellij.Utils`
`5`	`6`	`import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask`
`6`	`7`	`import org.jetbrains.intellij.tasks.RunIdeForUiTestTask`
`7`	`8`	`import software.aws.toolkits.gradle.IdeVersions`
`@@ -97,7 +98,7 @@ afterEvaluate {`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`tasks.withType<Test>().all {`
`100`		`- systemProperty("log.dir", "${intellij.sandboxDirectory}-test/logs")`
	`101`	`+ systemProperty("log.dir", "${Utils.stringInput(intellij.sandboxDirectory)}-test/logs")`
`101`	`102`	`systemProperty("testDataPath", project.rootDir.resolve("testdata").absolutePath)`
`102`	`103`	`}`
`103`	`104`