Skip to content

Commit 075cfd9

Browse files
MattyWeee123MattyWeee123
committed
Sync with 6331 exclusions.
Using 63331 exclusions. Fixes: #6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
1 parent 127c2dd commit 075cfd9

4 files changed

Lines changed: 68 additions & 32 deletions

File tree

‎buildenv/jenkins/JenkinsfileBase‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1664,4 +1664,4 @@ def forceCleanWS() {
16641664
}
16651665
}
16661666

1667-
return this
1667+
return this

‎buildenv/jenkins/openjdk_tests‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,4 +757,4 @@ def getEBCNode(demandId, dynamicMachineLabel) {
757757
echo "EBC Args: ${ebcArgs}"
758758
def ebcResult = ebcJenkinsNodeDemand(ebcArgs);
759759
echo "EBC Result: ${ebcResult}"
760-
}
760+
}

‎perf/dacapo/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@
7474
<target name="build">
7575
<antcall target="dist" inheritall="true" />
7676
</target>
77-
</project>
77+
</project>

‎perf/dacapo/playlist.xml‎

Lines changed: 65 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>dacapo-eclipse</testCaseName>
18+
<disables>
19+
<disable>
20+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
21+
<version>8</version>
22+
</disable>
23+
</disables>
1824
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) eclipse; \
1925
$(TEST_STATUS)</command>
2026
<versions>
@@ -29,12 +35,12 @@
2935
</test>
3036
<test>
3137
<testCaseName>dacapo-avrora</testCaseName>
32-
<disables>
33-
<disable>
34-
<comment>https://github.com/adoptium/aqa-tests/issues/4745#issuecomment-1710101571</comment>
35-
<version>21+</version>
36-
</disable>
37-
</disables>
38+
<disables>
39+
<disable>
40+
<comment>https://github.com/adoptium/aqa-tests/issues/4745#issuecomment-1710101571</comment>
41+
<version>21+</version>
42+
</disable>
43+
</disables>
3844
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) avrora; \
3945
$(TEST_STATUS)</command>
4046
<levels>
@@ -46,6 +52,13 @@
4652
</test>
4753
<test>
4854
<testCaseName>dacapo-fop</testCaseName>
55+
<disables>
56+
<disable>
57+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
58+
<version>8</version>
59+
<platform>s390x_linux</platform>
60+
</disable>
61+
</disables>
4962
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) fop; \
5063
$(TEST_STATUS)</command>
5164
<levels>
@@ -57,6 +70,12 @@
5770
</test>
5871
<test>
5972
<testCaseName>dacapo-h2</testCaseName>
73+
<disables>
74+
<disable>
75+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
76+
<version>8</version>
77+
</disable>
78+
</disables>
6079
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) h2; \
6180
$(TEST_STATUS)</command>
6281
<levels>
@@ -68,18 +87,23 @@
6887
</test>
6988
<test>
7089
<testCaseName>dacapo-jython</testCaseName>
71-
<disables>
72-
<disable>
73-
<comment>https://github.com/eclipse-openj9/openj9/issues/11942</comment>
74-
<version>16+</version>
75-
<impl>openj9</impl>
76-
</disable>
77-
<disable>
78-
<comment>https://github.com/adoptium/aqa-tests/issues/4711#issuecomment-1683178303</comment>
79-
<version>11</version>
80-
<platform>aarch64_windows</platform>
81-
</disable>
82-
</disables>
90+
<disables>
91+
<disable>
92+
<comment>https://github.com/eclipse-openj9/openj9/issues/11942</comment>
93+
<version>16+</version>
94+
<impl>openj9</impl>
95+
</disable>
96+
<disable>
97+
<comment>https://github.com/adoptium/aqa-tests/issues/4711#issuecomment-1683178303</comment>
98+
<version>11</version>
99+
<platform>aarch64_windows</platform>
100+
</disable>
101+
<disable>
102+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
103+
<version>8</version>
104+
<platform>x86-64_windows</platform>
105+
</disable>
106+
</disables>
83107
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) jython; \
84108
$(TEST_STATUS)</command>
85109
<levels>
@@ -91,6 +115,12 @@
91115
</test>
92116
<test>
93117
<testCaseName>dacapo-luindex</testCaseName>
118+
<disables>
119+
<disable>
120+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
121+
<version>8</version>
122+
</disable>
123+
</disables>
94124
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) luindex; \
95125
$(TEST_STATUS)</command>
96126
<levels>
@@ -102,11 +132,11 @@
102132
</test>
103133
<test>
104134
<testCaseName>dacapo-lusearch-fix</testCaseName>
105-
<disables>
106-
<disable>
107-
<comment>https://github.com/adoptium/aqa-tests/issues/1888#issuecomment-755015959</comment>
108-
</disable>
109-
</disables>
135+
<disables>
136+
<disable>
137+
<comment>https://github.com/adoptium/aqa-tests/issues/1888#issuecomment-755015959</comment>
138+
</disable>
139+
</disables>
110140
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) lusearch-fix; \
111141
$(TEST_STATUS)</command>
112142
<levels>
@@ -118,6 +148,12 @@
118148
</test>
119149
<test>
120150
<testCaseName>dacapo-pmd</testCaseName>
151+
<disables>
152+
<disable>
153+
<comment>https://github.com/adoptium/aqa-tests/issues/4858#issuecomment-2968494739</comment>
154+
<platform>x86-64_windows</platform>
155+
</disable>
156+
</disables>
121157
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) pmd; \
122158
$(TEST_STATUS)</command>
123159
<levels>
@@ -140,11 +176,11 @@
140176
</test>
141177
<test>
142178
<testCaseName>dacapo-tomcat</testCaseName>
143-
<disables>
144-
<disable>
145-
<comment>https://bugs.openjdk.java.net/browse/JDK-8155588</comment>
146-
</disable>
147-
</disables>
179+
<disables>
180+
<disable>
181+
<comment>https://bugs.openjdk.java.net/browse/JDK-8155588</comment>
182+
</disable>
183+
</disables>
148184
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)dacapo.jar$(Q) tomcat; \
149185
$(TEST_STATUS)</command>
150186
<levels>
@@ -165,4 +201,4 @@
165201
<group>perf</group>
166202
</groups>
167203
</test>
168-
</playlist>
204+
</playlist>

0 commit comments

Comments
 (0)