Skip to content

Commit ff860c5

Browse files
llxiallxia
authored
Merge pull request #20190 from LongyuZhang/xxx2
(v0.48.0) Fix testXXArgumentTesting
2 parents 7c2217e + 9c406d9 commit ff860c5

File tree

3 files changed

+49
-48
lines changed

3 files changed

+49
-48
lines changed

‎test/functional/cmdLineTests/xxargtest/XXArgumentTesting.xml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,53 +25,6 @@
2525
<!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
2626
<suite id="XXArgumentTesting.xml" timeout="1000">
2727

28-
<test id="Ensure -XXnosuballoc32bitmem is recognized on all platforms">
29-
<command>$EXE$ -Xcompressedrefs -XXnosuballoc32bitmem -version</command>
30-
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
31-
<output regex="no" type="failure">Command-line option unrecognised</output>
32-
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
33-
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
34-
<output type="failure" caseSensitive="yes" regex="no">Processing dump event</output>
35-
</test>
36-
37-
<exec command="rm -f testjavacore.txt" quiet="false"/>
38-
39-
<test id="Generate a javacore without -XXnosuballoc32bitmem">
40-
<command>$EXE$ -Xcompressedrefs -Xdump:java:events=vmstop,file=testjavacore.txt -version</command>
41-
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
42-
<output regex="no" type="failure">Command-line option unrecognised</output>
43-
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
44-
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
45-
</test>
46-
47-
<test id="Verify that the sub allocator memory is listed in the javacore">
48-
<command>cat testjavacore.txt</command>
49-
<output type="success" caseSensitive="no" regex="no">32bit allocation regions</output>
50-
</test>
51-
52-
<exec command="rm -f testjavacore.txt" quiet="false"/>
53-
54-
<test id="Generate a javacore with -XXnosuballoc32bitmem">
55-
<command>$EXE$ -Xcompressedrefs -XXnosuballoc32bitmem -Xdump:java:events=vmstop,file=testjavacore.txt -version</command>
56-
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
57-
<output regex="no" type="failure">Command-line option unrecognised</output>
58-
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
59-
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
60-
</test>
61-
62-
<test id="Verify that the sub allocator memory is not listed in the javacore on z/OS. All other platforms should use the sub-allocator when -XXnosuballoc32bitmem is used.">
63-
<command>cat testjavacore.txt</command>
64-
<output type="success" caseSensitive="no" regex="no">Javacore filename</output>
65-
<output type="failure" caseSensitive="no" regex="no" platforms="zos_390-64_cmprssptrs.*">32bit allocation regions</output>
66-
</test>
67-
68-
<test id="Verify -XX:MaxHeapSize -XX:InitialHeapSize -XX:ThreadStackSize">
69-
<command>$EXE$ -XX:MaxHeapSize=234m -XX:InitialHeapSize=11m -verbose:sizes -version</command>
70-
<output type="success" caseSensitive="no" regex="no">OpenJ9</output>
71-
<output type="required" caseSensitive="no" regex="no">-Xmx234M</output>
72-
<output type="required" caseSensitive="no" regex="no">-Xms11M</output>
73-
</test>
74-
7528
<test id="Verify -XX:+PrintFlagsFinal">
7629
<command>$EXE$ -XX:+PrintFlagsFinal -version</command>
7730
<output type="success" caseSensitive="no" regex="no">[Global flags]</output>

‎test/functional/cmdLineTests/xxargtest/XXArgumentTesting_j9.xml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,53 @@
2525
<!DOCTYPE suite SYSTEM "cmdlinetester.dtd">
2626
<suite id="XXArgumentTesting.xml" timeout="1000">
2727

28+
<test id="Ensure -XXnosuballoc32bitmem is recognized on all platforms">
29+
<command>$EXE$ -Xcompressedrefs -XXnosuballoc32bitmem -version</command>
30+
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
31+
<output regex="no" type="failure">Command-line option unrecognised</output>
32+
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
33+
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
34+
<output type="failure" caseSensitive="yes" regex="no">Processing dump event</output>
35+
</test>
36+
37+
<exec command="rm -f testjavacore.txt" quiet="false"/>
38+
39+
<test id="Generate a javacore without -XXnosuballoc32bitmem">
40+
<command>$EXE$ -Xcompressedrefs -Xdump:java:events=vmstop,file=testjavacore.txt -version</command>
41+
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
42+
<output regex="no" type="failure">Command-line option unrecognised</output>
43+
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
44+
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
45+
</test>
46+
47+
<test id="Verify that the sub allocator memory is listed in the javacore">
48+
<command>cat testjavacore.txt</command>
49+
<output type="success" caseSensitive="no" regex="no">32bit allocation regions</output>
50+
</test>
51+
52+
<exec command="rm -f testjavacore.txt" quiet="false"/>
53+
54+
<test id="Generate a javacore with -XXnosuballoc32bitmem">
55+
<command>$EXE$ -Xcompressedrefs -XXnosuballoc32bitmem -Xdump:java:events=vmstop,file=testjavacore.txt -version</command>
56+
<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
57+
<output regex="no" type="failure">Command-line option unrecognised</output>
58+
<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
59+
<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
60+
</test>
61+
62+
<test id="Verify that the sub allocator memory is not listed in the javacore on z/OS. All other platforms should use the sub-allocator when -XXnosuballoc32bitmem is used.">
63+
<command>cat testjavacore.txt</command>
64+
<output type="success" caseSensitive="no" regex="no">Javacore filename</output>
65+
<output type="failure" caseSensitive="no" regex="no" platforms="zos_390-64_cmprssptrs.*">32bit allocation regions</output>
66+
</test>
67+
68+
<test id="Verify -XX:MaxHeapSize -XX:InitialHeapSize -XX:ThreadStackSize">
69+
<command>$EXE$ -XX:MaxHeapSize=234m -XX:InitialHeapSize=11m -verbose:sizes -version</command>
70+
<output type="success" caseSensitive="no" regex="no">OpenJ9</output>
71+
<output type="required" caseSensitive="no" regex="no">-Xmx234M</output>
72+
<output type="required" caseSensitive="no" regex="no">-Xms11M</output>
73+
</test>
74+
2875
<test id="Verify single/rightmost -XX:+UseCompressedOops overrides earlier -XX:-UseCompressedOops or -Xnocompressedrefs (based on mode options)">
2976
<command>$EXE$ -XX:+UseCompressedOops -version</command>
3077
<output type="success" caseSensitive="yes" regex="no">Compressed References</output>

‎test/functional/cmdLineTests/xxargtest/playlist.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<variation>Mode150</variation>
2929
</variations>
3030
<command>$(JAVA_COMMAND) -DEXE=$(SQ)$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS)$(SQ) -jar $(CMDLINETESTER_JAR) \
31-
-config $(Q)$(TEST_RESROOT)$(D)XXArgumentTesting.xml$(Q); \
31+
-config $(Q)$(TEST_RESROOT)$(D)XXArgumentTesting.xml$(Q) \
32+
-nonZeroExitWhenError; \
3233
$(TEST_STATUS)</command>
3334
<levels>
3435
<level>sanity</level>

0 commit comments

Comments
 (0)