Skip to content

Commit

Permalink
8297736: test/jdk/java/foreign/TestMatrix.java is broken
Browse files Browse the repository at this point in the history
8291642: java/foreign/TestMatrix.java -few tests are failing due to JDK-8287158.

Reviewed-by: mcimadamore
  • Loading branch information
JornVernee committed Nov 30, 2022
1 parent 6bac332 commit 1a2ff58
Showing 1 changed file with 74 additions and 41 deletions.
115 changes: 74 additions & 41 deletions test/jdk/java/foreign/TestMatrix.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* libraries compiled, and then execute it with plain jtreg, like:
*
* $ 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 \
* ./test/jdk/java/foreign/TestMatrix.java
*/
Expand All @@ -38,8 +38,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallHighArity
*/

Expand All @@ -50,8 +50,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallHighArity
*/

Expand All @@ -62,8 +62,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallHighArity
*/

Expand All @@ -74,31 +74,53 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallHighArity
*/

/* @test id=Downcall-F
/* @test id=DowncallScope-F
* @enablePreview
* @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
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* TestDowncall
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* TestDowncallScope
*/

/* @test id=Downcall-T
/* @test id=DowncallScope-T
* @enablePreview
* @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
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* TestDowncall
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* 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
Expand All @@ -108,8 +130,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallScope
*/

Expand All @@ -120,8 +142,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallScope
*/

Expand All @@ -132,8 +154,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallScope
*/

Expand All @@ -144,8 +166,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallScope
*/

Expand All @@ -156,8 +178,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallAsync
*/

Expand All @@ -168,8 +190,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallAsync
*/

Expand All @@ -180,8 +202,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallAsync
*/

Expand All @@ -192,8 +214,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallAsync
*/

Expand All @@ -204,8 +226,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallStack
*/

Expand All @@ -216,8 +238,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=false
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false
* TestUpcallStack
*/

Expand All @@ -228,8 +250,8 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=false
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* TestUpcallStack
*/

Expand All @@ -240,7 +262,18 @@
*
* @run testng/othervm/native/manual
* --enable-native-access=ALL-UNNAMED
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
* -Djdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC=true
* -Djdk.internal.foreign.DowncallLinker.USE_SPEC=true
* -Djdk.internal.foreign.UpcallLinker.USE_SPEC=true
* 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
*/

1 comment on commit 1a2ff58

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.