From 8f22e305155e2bf85b609c6a58bc182ade70360d Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 20 Sep 2021 18:05:00 +0300 Subject: [PATCH] [JS IR] Enable property lazy initialization in tests --- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 7 ++----- .../test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 7754e3ea51f..7d1985bce6c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -156,7 +156,6 @@ abstract class BasicBoxTest( val splitPerModule = SPLIT_PER_MODULE.matcher(fileContent).find() val skipMangleVerification = SKIP_MANGLE_VERIFICATION.matcher(fileContent).find() - val propertyLazyInitialization = PROPERTY_LAZY_INITIALIZATION.matcher(fileContent).find() val safeExternalBoolean = SAFE_EXTERNAL_BOOLEAN.matcher(fileContent).find() val safeExternalBooleanDiagnosticMatcher = SAFE_EXTERNAL_BOOLEAN_DIAGNOSTIC.matcher(fileContent) @@ -232,7 +231,7 @@ abstract class BasicBoxTest( skipDceDriven, splitPerModule, errorPolicy, - propertyLazyInitialization, + propertyLazyInitialization = true, safeExternalBoolean, safeExternalBooleanDiagnostic, skipMangleVerification, @@ -663,7 +662,7 @@ abstract class BasicBoxTest( isMainModule = false, skipDceDriven = true, splitPerModule = false, - propertyLazyInitialization = false, + propertyLazyInitialization = true, safeExternalBoolean = false, safeExternalBooleanDiagnostic = null, skipMangleVerification = false, @@ -1165,8 +1164,6 @@ abstract class BasicBoxTest( private val ERROR_POLICY_PATTERN = Pattern.compile("^// *ERROR_POLICY: *(.+)$", Pattern.MULTILINE) - private val PROPERTY_LAZY_INITIALIZATION = Pattern.compile("^// *PROPERTY_LAZY_INITIALIZATION *$", Pattern.MULTILINE) - private val SAFE_EXTERNAL_BOOLEAN = Pattern.compile("^// *SAFE_EXTERNAL_BOOLEAN *$", Pattern.MULTILINE) private val SAFE_EXTERNAL_BOOLEAN_DIAGNOSTIC = Pattern.compile("^// *SAFE_EXTERNAL_BOOLEAN_DIAGNOSTIC: *(.+)$", Pattern.MULTILINE) 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 e052a682d15..442939ab100 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 @@ -445,7 +445,7 @@ abstract class BasicIrBoxTest( isMainModule, skipDceDriven = true, splitPerModule = false, // TODO?? - propertyLazyInitialization = false, // ?? + propertyLazyInitialization = true, safeExternalBoolean = false, safeExternalBooleanDiagnostic = null, skipMangleVerification = false,