Skip to content

Commit 62ec3ca

Browse files
authored
Make WasmJS/D8 tasks configuration-cache friedly (#309)
* Unignore conf-cache specific tests * Fix configuration-cache compatibility issue for Wasm/D8
1 parent 1b48530 commit 62ec3ca

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

integration/src/test/kotlin/kotlinx/benchmark/integration/ConfigurationCacheTest.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ class ConfigurationCacheTest : GradleTest() {
4040
)
4141

4242
@Test
43-
@Ignore("https://youtrack.jetbrains.com/issue/KT-58250")
4443
fun testConfigurationCacheJs() = runConfigurationCacheTest(
4544
"kotlin-multiplatform",
46-
listOf(":jsIrBenchmark"),
47-
listOf(":compileKotlinJsIr", ":jsIrBenchmarkGenerate", ":compileJsIrBenchmarkProductionExecutableKotlinJsIr")
45+
listOf(":jsBenchmark"),
46+
listOf(":compileKotlinJs", ":jsBenchmarkGenerate", ":compileJsBenchmarkProductionExecutableKotlinJs")
4847
)
4948

5049
@Test
@@ -55,11 +54,10 @@ class ConfigurationCacheTest : GradleTest() {
5554
)
5655

5756
@Test
58-
@Ignore("https://youtrack.jetbrains.com/issue/KT-58256")
5957
fun testConfigurationCacheWasm() = runConfigurationCacheTest(
6058
"kotlin-multiplatform",
6159
listOf(":wasmJsBenchmark"),
62-
listOf(":compileKotlinWasmJs", ":wasmBenchmarkGenerate", ":compileWasmBenchmarkProductionExecutableKotlinWasmJs")
60+
listOf(":compileKotlinWasmJs", ":wasmJsBenchmarkGenerate", ":compileWasmJsBenchmarkProductionExecutableKotlinWasmJs")
6361
)
6462
}
6563

plugin/main/src/kotlinx/benchmark/gradle/JsEngineExecTasks.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,8 @@ private fun Project.createD8Exec(
121121
}
122122
val reportFile = setupReporting(target, config)
123123
args(writeParameters(target.name, reportFile, traceFormat(), config))
124-
standardOutput = ConsoleAndFilesOutputStream()
124+
125+
doFirst {
126+
standardOutput = ConsoleAndFilesOutputStream()
127+
}
125128
}

0 commit comments

Comments
 (0)