Skip to content

Commit 010e3ea

Browse files
pshiptonpshipton
authored
Exclude j9 vector double/float tests on jdk25 (#6426)
* Revert "Allow j9 vector tests to have excludes (#6413)" This reverts commit 49b3ffb. * Exclude j9 vector double/float tests on jdk25 This reverts #6413 because excluding the single vector tests individually results in a "no tests selected" failure. Issues eclipse-openj9/openj9#22228 eclipse-openj9/openj9#21945 Signed-off-by: Peter Shipton <[email protected]> --------- Signed-off-by: Peter Shipton <[email protected]>
1 parent 37b4c9e commit 010e3ea

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

‎openjdk/excludes/ProblemList_openjdk25-openj9.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,14 @@ java/util/stream/GatherersMapConcurrentTest.java https://github.com/eclipse-open
549549

550550
# jdk_vector
551551

552-
jdk/incubator/vector/Double128VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
553-
jdk/incubator/vector/Float128VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
552+
jdk/incubator/vector/Double256VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
553+
jdk/incubator/vector/Double512VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
554+
jdk/incubator/vector/Double64VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
555+
jdk/incubator/vector/DoubleMaxVectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
556+
jdk/incubator/vector/Float256VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
557+
jdk/incubator/vector/Float512VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
558+
jdk/incubator/vector/Float64VectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
559+
jdk/incubator/vector/FloatMaxVectorTests.java https://github.com/eclipse-openj9/openj9/issues/21945 generic-all
554560

555561
############################################################################
556562

‎openjdk/playlist.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2724,6 +2724,12 @@
27242724
</test>
27252725
<test>
27262726
<testCaseName>jdk_vector_float128_j9</testCaseName>
2727+
<disables>
2728+
<disable>
2729+
<comment>https://github.com/eclipse-openj9/openj9/issues/21945</comment>
2730+
<version>25+</version>
2731+
</disable>
2732+
</disables>
27272733
<variations>
27282734
<variation>-Xjit:{*Float128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI}</variation>
27292735
</variations>
@@ -2733,7 +2739,6 @@
27332739
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
27342740
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
27352741
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2736-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
27372742
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Float128VectorTests.java$(Q) &amp;&amp; \
27382743
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Float128VectorTests.jtr" &amp;&amp; \
27392744
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Float128VectorTests.jtr; \
@@ -2760,6 +2765,12 @@
27602765
</test>
27612766
<test>
27622767
<testCaseName>jdk_vector_double128_j9</testCaseName>
2768+
<disables>
2769+
<disable>
2770+
<comment>https://github.com/eclipse-openj9/openj9/issues/21945</comment>
2771+
<version>25+</version>
2772+
</disable>
2773+
</disables>
27632774
<variations>
27642775
<variation>-Xjit:{*Double128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI}</variation>
27652776
</variations>
@@ -2769,7 +2780,6 @@
27692780
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
27702781
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
27712782
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2772-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
27732783
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Double128VectorTests.java$(Q) &amp;&amp; \
27742784
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Double128VectorTests.jtr" &amp;&amp; \
27752785
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Double128VectorTests.jtr; \
@@ -2805,7 +2815,6 @@
28052815
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
28062816
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
28072817
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2808-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
28092818
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Int128VectorTests.java$(Q) &amp;&amp; \
28102819
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Int128VectorTests.jtr" &amp;&amp; \
28112820
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Int128VectorTests.jtr; \
@@ -2841,7 +2850,6 @@
28412850
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
28422851
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
28432852
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2844-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
28452853
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Short128VectorTests.java$(Q) &amp;&amp; \
28462854
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Short128VectorTests.jtr" &amp;&amp; \
28472855
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Short128VectorTests.jtr; \
@@ -2877,7 +2885,6 @@
28772885
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
28782886
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
28792887
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2880-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
28812888
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Byte128VectorTests.java$(Q) &amp;&amp; \
28822889
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Byte128VectorTests.jtr" &amp;&amp; \
28832890
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Byte128VectorTests.jtr; \
@@ -2913,7 +2920,6 @@
29132920
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
29142921
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
29152922
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2916-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
29172923
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Long128VectorTests.java$(Q) &amp;&amp; \
29182924
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Long128VectorTests.jtr" &amp;&amp; \
29192925
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Long128VectorTests.jtr; \
@@ -2949,7 +2955,6 @@
29492955
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
29502956
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
29512957
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
2952-
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
29532958
$(Q)$(JTREG_JDK_TEST_DIR)$(D)jdk/incubator/vector/Byte64VectorTests.java$(Q) &amp;&amp; \
29542959
echo "grep #VECTOR API $(REPORTDIR)/work/jdk/incubator/vector/Byte64VectorTests.jtr" &amp;&amp; \
29552960
grep "#VECTOR API" $(REPORTDIR)/work/jdk/incubator/vector/Byte64VectorTests.jtr; \

0 commit comments

Comments
 (0)