From 086241659e5df971349ec43f2b8c9f3942f08116 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 25 May 2020 13:16:30 +0300 Subject: [PATCH] [JS TESTS] Don't run ES6 test on win & mac till j2v8 issue is fixed. --- .../org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index f41e641624b..fa00a384082 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -56,6 +56,8 @@ abstract class BasicIrBoxTest( val runEs6Mode: Boolean = getBoolean("kotlin.js.ir.es6", false) + private val osName: String = System.getProperty("os.name").toLowerCase() + // TODO Design incremental compilation for IR and add test support override val incrementalCompilationChecksEnabled = false @@ -190,6 +192,17 @@ abstract class BasicIrBoxTest( } } + override fun dontRunOnSpecificPlatform(targetBackend: TargetBackend): Boolean { + if (targetBackend != TargetBackend.JS_IR_ES6) return false + if (!runEs6Mode) return false + + // TODO: Since j2v8 does not support ES6 on mac and windows, temporary don't run such test on those platforms. + if (osName.indexOf("win") >= 0) return true + if (osName.indexOf("mac") >= 0 || osName.indexOf("darwin") >= 0) return true + + return false + } + override fun runGeneratedCode( jsFiles: List, testModuleName: String?,