azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix android tests

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-10-29 17:28:14 +03:00
parent 75a8699467
commit 8deef10292
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
+1
View File
@@ -74,6 +74,7 @@ public class SpecialFiles {
excludedFiles.add("invokeOnImportedEnum1.kt"); // Cannot change package name excludedFiles.add("invokeOnImportedEnum1.kt"); // Cannot change package name
excludedFiles.add("invokeOnImportedEnum2.kt"); // Cannot change package name excludedFiles.add("invokeOnImportedEnum2.kt"); // Cannot change package name
excludedFiles.add("sortEnumEntries.kt"); // Cannot change package name excludedFiles.add("sortEnumEntries.kt"); // Cannot change package name
excludedFiles.add("assertionStackTrace.kt"); // Cannot change package name
excludedFiles.add("kt326.kt"); // Commented excludedFiles.add("kt326.kt"); // Commented
excludedFiles.add("kt1213.kt"); // Commented excludedFiles.add("kt1213.kt"); // Commented
compiler/testData/codegen/bytecodeText/storeStackBeforeInline/primitiveMerge.kt
+1 -1
View File
@@ -4,7 +4,7 @@ fun foobar(x: Boolean, y: String, z: String) = x.toString() + y + z
inline fun foo() = "-" inline fun foo() = "-"
fun box() { fun test() {
val result = foobar(if (1 == 1) true else bar(), foo(), "OK") val result = foobar(if (1 == 1) true else bar(), foo(), "OK")
} }