Remove ignore tag for tests that don't fail any more

Check for execution correctness inside the test
Fix run_external to include compileKotlinAgainstKotlin
This commit is contained in:
Pavel Punegov
2018-02-06 13:13:49 +03:00
committed by Pavel Punegov
parent be251c98fb
commit f097756721
62 changed files with 22 additions and 70 deletions
+1 -5
View File
@@ -195,11 +195,7 @@ def createTestTasks(File testRoot, Class<Task> taskType, Closure taskConfigurati
task run_external () { task run_external () {
// Create tasks for external tests. // Create tasks for external tests.
for (testDir in ["codegen", "compileKotlinAgainstKotlin"]) { createTestTasks(externalTestsDir, RunExternalTestGroup) { }
createTestTasks(new File(externalTestsDir, testDir), RunExternalTestGroup) {
it.goldValue = "OK"
}
}
// Set up dependencies. // Set up dependencies.
dependsOn(clean) dependsOn(clean)
@@ -1,4 +1,5 @@
// IGNORE_BACKEND: JS, NATIVE //
// IGNORE_BACKEND: JS
inline fun ltx(a: Comparable<Any>, b: Any) = a < b inline fun ltx(a: Comparable<Any>, b: Any) = a < b
inline fun lex(a: Comparable<Any>, b: Any) = a <= b inline fun lex(a: Comparable<Any>, b: Any) = a <= b
@@ -1,5 +1,4 @@
// IGNORE_BACKEND: JS // IGNORE_BACKEND: JS
// IGNORE_BACKEND: NATIVE
fun equals1(a: Double, b: Double) = a.equals(b) fun equals1(a: Double, b: Double) = a.equals(b)
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
class StrList : List<String?> { class StrList : List<String?> {
override val size: Int override val size: Int
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
class Generic<P : Any>(val p: P) class Generic<P : Any>(val p: P)
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
// WITH_REFLECT // WITH_REFLECT
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
// WITH_REFLECT // WITH_REFLECT
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
// WITH_REFLECT // WITH_REFLECT
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
fun box(): String { fun box(): String {
fun bar() {} fun bar() {}
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
// This is a big, ugly, semi-auto generated test. // This is a big, ugly, semi-auto generated test.
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
// This is a big, ugly, semi-auto generated test. // This is a big, ugly, semi-auto generated test.
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class Itr : Iterator<String> by ArrayList<String>().iterator() class Itr : Iterator<String> by ArrayList<String>().iterator()
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
import kotlin.test.assertEquals import kotlin.test.assertEquals
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
fun box(): String { fun box(): String {
val x: CharSequence = "" val x: CharSequence = ""
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// KT-16291 Smart cast doesn't work when getting class of instance // KT-16291 Smart cast doesn't work when getting class of instance
class Foo(val s: String) { class Foo(val s: String) {
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
public object SomeClass { public object SomeClass {
private val work = object : Runnable { private val work = object : Runnable {
override fun run() { override fun run() {
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
class C { class C {
private fun String.ext() : String = "" private fun String.ext() : String = ""
private fun f() {} private fun f() {}
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
class C{ class C{
private var v : Int = 0 private var v : Int = 0
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
class A() { class A() {
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: NATIVE
package demo2 package demo2
fun print(o : Any?) {} fun print(o : Any?) {}
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: NATIVE
package demo2 package demo2
fun print(o : Any?) {} fun print(o : Any?) {}
@@ -1,6 +1,5 @@
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// IGNORE_BACKEND: NATIVE
import helpers.* import helpers.*
import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.* import kotlin.coroutines.experimental.intrinsics.*
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
import helpers.* import helpers.*
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
import helpers.* import helpers.*
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// IGNORE_BACKEND: JVM // IGNORE_BACKEND: JVM
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
import helpers.* import helpers.*
@@ -1,6 +1,5 @@
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// IGNORE_BACKEND: NATIVE
import helpers.* import helpers.*
import kotlin.coroutines.experimental.* import kotlin.coroutines.experimental.*
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
val NAN = Double.NaN val NAN = Double.NaN
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
val NAN = Float.NaN val NAN = Float.NaN
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
fun box(): String { fun box(): String {
if ((-0.0 as Comparable<Double>) >= 0.0) return "fail 0" if ((-0.0 as Comparable<Double>) >= 0.0) return "fail 0"
if ((-0.0F as Comparable<Float>) >= 0.0F) return "fail 1" if ((-0.0F as Comparable<Float>) >= 0.0F) return "fail 1"
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
fun <K: Any, V: Any> foo(k: K, v: V) { fun <K: Any, V: Any> foo(k: K, v: V) {
val map = HashMap<K, V>() val map = HashMap<K, V>()
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
package test package test
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,5 +1,5 @@
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
package test package test
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
// FILE: lateinit.kt // FILE: lateinit.kt
private lateinit var s: String private lateinit var s: String
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,6 +1,5 @@
// LANGUAGE_VERSION: 1.2 // LANGUAGE_VERSION: 1.2
// WITH_RUNTIME // WITH_RUNTIME
// IGNORE_BACKEND: NATIVE
import kotlin.UninitializedPropertyAccessException import kotlin.UninitializedPropertyAccessException
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
+1 -1
View File
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// on JS Parser.parse and MultiParser.parse clash in ProjectInfoJsonParser // on JS Parser.parse and MultiParser.parse clash in ProjectInfoJsonParser
class JsonObject { class JsonObject {
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
interface A<T, U : Number, V : Any> { interface A<T, U : Number, V : Any> {
fun foo(t: T, u: U): V? { fun foo(t: T, u: U): V? {
return null return null
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,5 +1,5 @@
// TODO: muted automatically, investigate should it be ran for JS or not // TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS, NATIVE // IGNORE_BACKEND: JS
// WITH_RUNTIME // WITH_RUNTIME
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_REFLECT // WITH_REFLECT
// FILE: 1.kt // FILE: 1.kt
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_REFLECT // WITH_REFLECT
// FILE: 1.kt // FILE: 1.kt
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// FILE: 1.kt // FILE: 1.kt
package test package test
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: NATIVE
// FILE: A.kt // FILE: A.kt
// WITH_RUNTIME // WITH_RUNTIME
package a package a
@@ -752,7 +752,8 @@ import kotlin.test.Test
fun runTest() { fun runTest() {
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
val result = box() val result = box()
${ (goldValue != null) ? "print(result)" : "" } if (result != "OK") throw AssertionError("Test failed with: " + result)
print(result)
} }
""" ) """ )
createFile(file, text.toString()) createFile(file, text.toString())