Skip to content

Commit d5cf604

Browse files
author
Cheng Jin
committed
[JDK17]Enable FFI related jtreg test suites on Power and zLinux
The changes add Power & zLinux support to those FFI related jtreg test suites to ensure they are executed on all supported platforms. Note: The PR is part of FFI downcall & upcall work at eclipse-openj9/openj9#12412 and eclipse-openj9/openj9#15068. Signed-off-by: Cheng Jin <[email protected]>
1 parent f302c65 commit d5cf604

26 files changed

+220
-0
lines changed

test/jdk/java/foreign/SafeFunctionAccessTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @run testng/othervm --enable-native-access=ALL-UNNAMED SafeFunctionAccessTest
2835
*/
2936

test/jdk/java/foreign/StdLibTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @run testng/othervm --enable-native-access=ALL-UNNAMED StdLibTest
2835
*/
2936

test/jdk/java/foreign/TestCircularInit1.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @modules jdk.incubator.foreign/jdk.internal.foreign
2835
* @run testng/othervm TestCircularInit1
2936
*/

test/jdk/java/foreign/TestCircularInit2.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @modules jdk.incubator.foreign/jdk.internal.foreign
2835
* @run testng/othervm TestCircularInit2
2936
*/
@@ -42,6 +49,9 @@ public void testCircularInit() {
4249
assertNotNull(PlatformLayouts.Win64.C_CHAR);
4350
assertNotNull(PlatformLayouts.SysV.C_CHAR);
4451
assertNotNull(PlatformLayouts.AArch64.C_CHAR);
52+
assertNotNull(PlatformLayouts.SysVPPC64le.C_CHAR);
53+
assertNotNull(PlatformLayouts.SysVS390x.C_CHAR);
54+
assertNotNull(PlatformLayouts.AIX.C_CHAR);
4555
}
4656

4757
}

test/jdk/java/foreign/TestCondy.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @run testng TestCondy
2835
*/
2936

test/jdk/java/foreign/TestDowncall.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@
2222
*
2323
*/
2424

25+
/*
26+
* ===========================================================================
27+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
28+
* ===========================================================================
29+
*/
30+
2531
/*
2632
* @test
2733
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
34+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2835
* @modules jdk.incubator.foreign/jdk.internal.foreign
2936
* @build NativeTestHelper CallGeneratorHelper TestDowncall
3037
*

test/jdk/java/foreign/TestFunctionDescriptor.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@
2222
*
2323
*/
2424

25+
/*
26+
* ===========================================================================
27+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
28+
* ===========================================================================
29+
*/
30+
2531
/*
2632
* @test
2733
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
34+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2835
* @run testng TestFunctionDescriptor
2936
*/
3037

test/jdk/java/foreign/TestIntrinsics.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@
2121
* questions.
2222
*/
2323

24+
/*
25+
* ===========================================================================
26+
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
27+
* ===========================================================================
28+
*/
29+
2430
/*
2531
* @test
2632
* @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
33+
* | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x"
2734
* @run testng/othervm
2835
* -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true
2936
* -Djdk.internal.foreign.ProgrammableInvoker.USE_INTRINSICS=true

0 commit comments

Comments
 (0)