1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8297736: test/jdk/java/foreign/TestMatrix.java is broken

Browse Source 
8291642: java/foreign/TestMatrix.java -few tests are failing due to JDK-8287158.

Reviewed-by: mcimadamore
This commit is contained in:
Jorn Vernee 2022-11-30 19:59:43 +00:00
parent 6bac332371
commit 1a2ff58761
1 changed files with 74 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
test/jdk/java/foreign/TestMatrix.java
View File

@ -26,7 +26,7 @@
* libraries compiled, and then execute it with plain jtreg, like: * libraries compiled, and then execute it with plain jtreg, like:
* *
* $ bin/jtreg -jdk:<path-to-tested-jdk> \ * $ bin/jtreg -jdk:<path-to-tested-jdk> \
* -nativepath:<path-to-build-dir>/support/test/jdk/jtreg/native/manual/lib/ \ * -nativepath:<path-to-build-dir>/images/test/jdk/jtreg/native/ \
* -concurrency:auto \ * -concurrency:auto \
* ./test/jdk/java/foreign/TestMatrix.java * ./test/jdk/java/foreign/TestMatrix.java
*/ */
@ -38,8 +38,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallHighArity * TestUpcallHighArity
*/ */
@ -50,8 +50,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallHighArity * TestUpcallHighArity
*/ */
@ -62,8 +62,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallHighArity * TestUpcallHighArity
*/ */
@ -74,31 +74,53 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallHighArity * TestUpcallHighArity
*/ */
/* @test id=Downcall-F /* @test id=DowncallScope-F
* @enablePreview * @enablePreview
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64" * @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
* @build NativeTestHelper CallGeneratorHelper TestDowncall * @build NativeTestHelper CallGeneratorHelper TestDowncallBase
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* TestDowncall * TestDowncallScope
*/ */
/* @test id=Downcall-T /* @test id=DowncallScope-T
* @enablePreview * @enablePreview
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64" * @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
* @build NativeTestHelper CallGeneratorHelper TestDowncall * @build NativeTestHelper CallGeneratorHelper TestDowncallBase
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* TestDowncall * TestDowncallScope
*/
/* @test id=DowncallStack-F
* @enablePreview
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
* @build NativeTestHelper CallGeneratorHelper TestDowncallBase
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* TestDowncallStack
*/
/* @test id=DowncallStack-T
* @enablePreview
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
* @build NativeTestHelper CallGeneratorHelper TestDowncallBase
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* TestDowncallStack
*/ */
/* @test id=UpcallScope-FF /* @test id=UpcallScope-FF
@ -108,8 +130,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallScope * TestUpcallScope
*/ */
@ -120,8 +142,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallScope * TestUpcallScope
*/ */
@ -132,8 +154,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallScope * TestUpcallScope
*/ */
@ -144,8 +166,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallScope * TestUpcallScope
*/ */
@ -156,8 +178,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallAsync * TestUpcallAsync
*/ */
@ -168,8 +190,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallAsync * TestUpcallAsync
*/ */
@ -180,8 +202,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallAsync * TestUpcallAsync
*/ */
@ -192,8 +214,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallAsync * TestUpcallAsync
*/ */
@ -204,8 +226,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallStack * TestUpcallStack
*/ */
@ -216,8 +238,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallStack * TestUpcallStack
*/ */
@ -228,8 +250,8 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallStack * TestUpcallStack
*/ */
@ -240,7 +262,18 @@
* *
* @run testng/othervm/native/manual * @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED * --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true * -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true * -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallStack * TestUpcallStack
*/ */
/*
* @test id=VarArgs
* @enablePreview
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
* @build NativeTestHelper CallGeneratorHelper
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* TestVarArgs
*/