8290164: compiler/runtime/TestConstantsInError.java fails on riscv
Reviewed-by: fyang, yadongwang
This commit is contained in:
parent
dbab827bee
commit
3471ac9a90
@ -130,7 +130,7 @@ public abstract class TestConstantsInError implements OutputProcessor {
|
||||
results.shouldMatch("Test_C1/.*::test \\(3 bytes\\)$")
|
||||
.shouldMatch("Test_C2/.*::test \\(3 bytes\\)$");
|
||||
|
||||
if (isC1 && Platform.isAArch64()) { // no code patching
|
||||
if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
|
||||
results.shouldMatch("Test_C1/.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_C2/.*::test \\(3 bytes\\) made not entrant");
|
||||
} else {
|
||||
@ -168,7 +168,7 @@ public abstract class TestConstantsInError implements OutputProcessor {
|
||||
.shouldMatch("Test_MH3/.*::test \\(3 bytes\\)$")
|
||||
.shouldMatch("Test_MH4/.*::test \\(3 bytes\\)$");
|
||||
|
||||
if (isC1 && Platform.isAArch64()) { // no code patching
|
||||
if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
|
||||
results.shouldMatch("Test_MH1/.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_MH2/.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_MH3/.*::test \\(3 bytes\\) made not entrant")
|
||||
@ -191,7 +191,7 @@ public abstract class TestConstantsInError implements OutputProcessor {
|
||||
results.shouldMatch("Test_MT1/.*::test \\(3 bytes\\)$")
|
||||
.shouldMatch("Test_MT2/.*::test \\(3 bytes\\)$");
|
||||
|
||||
if (isC1 && Platform.isAArch64()) { // no code patching
|
||||
if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
|
||||
results.shouldMatch("Test_MT1/.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_MT2/.*::test \\(3 bytes\\) made not entrant");
|
||||
} else {
|
||||
@ -235,7 +235,7 @@ public abstract class TestConstantsInError implements OutputProcessor {
|
||||
.shouldMatch("Test_CD3.*::test \\(3 bytes\\)$")
|
||||
.shouldMatch("Test_CD4.*::test \\(3 bytes\\)$");
|
||||
|
||||
if (isC1 && Platform.isAArch64()) { // no code patching
|
||||
if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
|
||||
results.shouldMatch("Test_CD1.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_CD2.*::test \\(3 bytes\\) made not entrant")
|
||||
.shouldMatch("Test_CD3.*::test \\(3 bytes\\) made not entrant")
|
||||
|
Loading…
x
Reference in New Issue
Block a user