Skip to content

Commit 9d03063

Browse files
feilongjiangRealFYang
authored andcommitted
8278474: riscv: Enable two more jtreg hotspot tests
Reviewed-by: fyang
1 parent 1a43775 commit 9d03063

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

test/hotspot/jtreg/compiler/c2/TestBit.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @library /test/lib /
3434
*
3535
* @requires vm.flagless
36-
* @requires os.arch=="aarch64" | os.arch=="amd64" | os.arch == "ppc64le"
36+
* @requires os.arch=="aarch64" | os.arch=="amd64" | os.arch == "ppc64le" | os.arch == "riscv64"
3737
* @requires vm.debug == true & vm.compiler2.enabled
3838
*
3939
* @run driver compiler.c2.TestBit
@@ -55,7 +55,8 @@ static void runTest(String testName) throws Exception {
5555
String expectedTestBitInstruction =
5656
"ppc64le".equals(System.getProperty("os.arch")) ? "ANDI" :
5757
"aarch64".equals(System.getProperty("os.arch")) ? "tb" :
58-
"amd64".equals(System.getProperty("os.arch")) ? "test" : null;
58+
"amd64".equals(System.getProperty("os.arch")) ? "test" :
59+
"riscv64".equals(System.getProperty("os.arch")) ? "andi" : null;
5960

6061
if (expectedTestBitInstruction != null) {
6162
output.shouldContain(expectedTestBitInstruction);

test/hotspot/jtreg/serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @summary Verifies that AsyncGetCallTrace is call-able and provides sane information.
3030
* @compile ASGCTBaseTest.java
3131
* @requires os.family == "linux"
32-
* @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="arm" | os.arch=="aarch64" | os.arch=="ppc64" | os.arch=="s390"
32+
* @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="arm" | os.arch=="aarch64" | os.arch=="ppc64" | os.arch=="s390" | os.arch=="riscv64"
3333
* @requires vm.jvmti
3434
* @run main/othervm/native -agentlib:AsyncGetCallTraceTest MyPackage.ASGCTBaseTest
3535
*/

0 commit comments

Comments
 (0)