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

Minor. Update test data to support Corretto JVM 11

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-04-20 16:53:06 +02:00
parent 38bfcc7ac6
commit d83a35d898
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/external/jvmStaticExternal.kt
Vendored
+4 -2
View File
@@ -24,7 +24,8 @@ fun box(): String {
return "Link error expected"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D" &&
e.message != "'double foo.WithNative.bar(long, java.lang.String)'") return "Fail 1: " + e.message
}
try {
@@ -32,7 +33,8 @@ fun box(): String {
return "Link error expected on object"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.message
if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D" &&
e.message != "'double foo.ObjWithNative.bar(long, java.lang.String)'") return "Fail 2: " + e.message
}
return "OK"
}
compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun box(): String {
return "Link error expected"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "C.foo()V") return "Fail 1: " + e.message
if (e.message != "C.foo()V" && e.message != "'void C.foo()'") return "Fail 1: " + e.message
}
return "OK"
compiler/testData/codegen/box/external/withDefaultArg.kt
Vendored
+6 -3
View File
@@ -22,7 +22,8 @@ fun box(): String {
return "Link error expected on object"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D" &&
e.message != "'double foo.ObjWithNative.bar(long, java.lang.String)'") return "Fail 1: " + e.message
}
try {
@@ -30,7 +31,8 @@ fun box(): String {
return "Link error expected on object"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.message
if (e.message != "foo.ObjWithNative.foo(I)D" &&
e.message != "'double foo.ObjWithNative.foo(int)'") return "Fail 2: " + e.message
}
try {
@@ -38,7 +40,8 @@ fun box(): String {
return "Link error expected on object"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.WithDefaultArgKt.topLevel(I)D") return "Fail 3: " + e.message
if (e.message != "foo.WithDefaultArgKt.topLevel(I)D" &&
e.message != "'double foo.WithDefaultArgKt.topLevel(int)'") return "Fail 3: " + e.message
}
return "OK"
}
compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt
Vendored
+8 -8
View File
@@ -29,27 +29,27 @@ var defaultSetter: Int = 1
external get
external set
fun check(body: () -> Unit, signature: String): String? {
fun check(body: () -> Unit, signature: String, jdk11Signature: String): String? {
try {
body()
return "Link error expected"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != signature) return "Fail $signature: " + e.message
if (e.message != signature && e.message != jdk11Signature) return "Fail $signature: " + e.message
}
return null
}
fun box(): String {
return check({defaultGetter}, "NativePropertyAccessorsKt.getDefaultGetter()I")
?: check({defaultSetter = 1}, "NativePropertyAccessorsKt.setDefaultSetter(I)V")
return check({defaultGetter}, "NativePropertyAccessorsKt.getDefaultGetter()I", "'int NativePropertyAccessorsKt.getDefaultGetter()'")
?: check({defaultSetter = 1}, "NativePropertyAccessorsKt.setDefaultSetter(I)V", "'void NativePropertyAccessorsKt.setDefaultSetter(int)'")
?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I")
?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V")
?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I", "'int C\$Companion.getDefaultGetter()'")
?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V", "'void C\$Companion.setDefaultSetter(int)'")
?: check({C().defaultGetter}, "C.getDefaultGetter()I")
?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V")
?: check({C().defaultGetter}, "C.getDefaultGetter()I", "'int C.getDefaultGetter()'")
?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V", "'void C.setDefaultSetter(int)'")
?: "OK"
}
compiler/testData/codegen/box/fullJdk/native/topLevel.kt
Vendored
+2 -1
View File
@@ -15,7 +15,8 @@ fun box(): String {
return "Link error expected on object"
}
catch (e: java.lang.UnsatisfiedLinkError) {
if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D" &&
e.message != "'double foo.TopLevelKt.bar(long, java.lang.String)'") return "Fail 1: " + e.message
}
return "OK"