From 2ecea55cb1e979ed9e765ebfaaa547ba4e5c8f4b Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Wed, 15 Aug 2018 16:18:21 +0300 Subject: [PATCH] Ignore coroutines and assertion tests in android tests generator for now. --- .../tests/CodegenTestsOnAndroidGenerator.kt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index 20f4af742bc..9314f289cb7 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.android.tests @@ -209,6 +198,10 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager val fullFileText = FileUtil.loadFile(file, true) //TODO support JvmPackageName if (fullFileText.contains("@file:JvmPackageName(")) continue + // TODO: Support coroutines tests + if (fullFileText.contains("// WITH_COROUTINES")) continue + // TODO: Support jvm assertions + if (fullFileText.contains("// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm")) continue if (hasBoxMethod(fullFileText)) { val testFiles = createTestFiles(file, fullFileText)