archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8247526: [TESTBUG] runtime/cds/appcds/dynamicArchive tests failing with Graal

Browse source 
Adjusted the "shouldMatch" statement and increased the timeout of some tests.

Reviewed-by: iklam
This commit is contained in:
Calvin Cheung 2020-06-16 22:05:09 +00:00
parent a27ee6b284
commit 3237e82b4b
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForClassInBaseArchive.java
View file

@ -95,7 +95,7 @@ public class LambdaForClassInBaseArchive extends DynamicArchiveTestBase {
.assertNormalExit(out -> { .assertNormalExit(out -> {
out.shouldHaveExitValue(0) out.shouldHaveExitValue(0)
.shouldContain("SimpleApp source: shared objects file") .shouldContain("SimpleApp source: shared objects file")
.shouldMatch(".class.load. SimpleApp[$][$]Lambda[$]1/0x.*source:.*shared.*objects.*file.*(top)"); .shouldMatch(".class.load. SimpleApp[$][$]Lambda[$].*/0x.*source:.*shared.*objects.*file.*(top)");
}); });
} }
} }

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NestTest.java
View file

@ -67,7 +67,7 @@ public class NestTest extends DynamicArchiveTestBase {
"-Xlog:class+load=debug,class+resolve=debug,class+unload=info", "-Xlog:class+load=debug,class+resolve=debug,class+unload=info",
"-cp", appJar, mainClass, "run") "-cp", appJar, mainClass, "run")
.assertNormalExit(output -> { .assertNormalExit(output -> {
output.shouldMatch(".class.load.* NestApp[$]InnerA[$]InnerInnerA[$][$]Lambda[$]1/0x.*source:.*shared.*objects.*file.*(top)") output.shouldMatch(".class.load.* NestApp[$]InnerA[$]InnerInnerA[$][$]Lambda[$].*/0x.*source:.*shared.*objects.*file.*(top)")
.shouldHaveExitValue(0); .shouldHaveExitValue(0);
}); });
} }

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/StaticInnerTest.java
View file

@ -61,7 +61,7 @@ public class StaticInnerTest extends DynamicArchiveTestBase {
.assertNormalExit(output -> { .assertNormalExit(output -> {
output.shouldHaveExitValue(0) output.shouldHaveExitValue(0)
.shouldContain("HelloStaticInner source: shared objects file (top)") .shouldContain("HelloStaticInner source: shared objects file (top)")
.shouldMatch(".class.load. HelloStaticInner[$]InnerHello[$][$]Lambda[$]1/0x.*source:.*shared.*objects.*file.*(top)"); .shouldMatch(".class.load. HelloStaticInner[$]InnerHello[$][$]Lambda[$].*/0x.*source:.*shared.*objects.*file.*(top)");
}); });
} }
} }

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh
View file

@ -51,7 +51,7 @@ do
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox\$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox\$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. $i * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. $i
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesAsCollectorTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesAsCollectorTest
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesCastFailureTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesCastFailureTest
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesGeneralTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesGeneralTest
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesInvokersTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesInvokersTest
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesPermuteArgumentsTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesPermuteArgumentsTest
*/ */
import org.junit.Test; import org.junit.Test;

2
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java
View file

@ -41,7 +41,7 @@
* ../test-classes/TestMHApp.java * ../test-classes/TestMHApp.java
* @build sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesSpreadArgumentsTest * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesSpreadArgumentsTest
*/ */
import org.junit.Test; import org.junit.Test;