Closed sendaoYan closed 2 years ago
patch:
git diff
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
index aac12fe3..499da908 100644
--- a/openjdk/playlist.xml
+++ b/openjdk/playlist.xml
@@ -1943,6 +1943,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/com/alibaba/wisp2$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
<version>11</version>
@@ -1972,6 +1975,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/com/alibaba/wisp$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
<version>11</version>
@@ -2003,6 +2009,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/com/alibaba/rcm$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2031,6 +2040,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/com/alibaba/management$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2060,6 +2072,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/multi-tenant$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2088,6 +2103,9 @@
$(Q)$(JTREG_JDK_TEST_DIR)/elastic-heap$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2116,6 +2134,9 @@
$(Q)$(JTREG_HOTSPOT_TEST_DIR)/elastic-heap$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2144,6 +2165,9 @@
$(Q)$(JTREG_HOTSPOT_TEST_DIR)/jwarmup$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
@@ -2173,6 +2197,9 @@
$(Q)$(JTREG_HOTSPOT_TEST_DIR)/multi-tenant$(Q); \
$(TEST_STATUS)
</command>
+ <features>
+ <feature>Dragonwell_Standard:nonapplicable</feature>
+ </features>
<versions>
<version>8</version>
</versions>
Describe the bug dragonwell standard version run dragonwell8_feature_jdk0 test target error, which complaint Error: Cannot find file: test/jdk/com/alibaba/wisp2
To Reproduce Steps to reproduce the behavior (or Grinder rerun link):
Expected behavior skip releate test target
Screenshots If applicable, add screenshots to help explain your problem.
Additional context
Dragonwell8/dragonwell11 will release standard version and entended version. The diffrence between them is, The standard version doesn’t include dragonwell feature(such as wisp/jwarmup etc..), The extended version include dragonwell feature.
The sanity.openjdk and extended.openjdk contains several dragonwell feature tests, such as https://github.com/adoptium/aqa-tests/blob/master/openjdk/playlist.xml#L1933
But the standard dragonwell doesn’t support these tests, so the git repo branch doesn’t contains these testcases. When we run sanity.openjdk and extended.openjdk test target, it will complaint “Cannot find file”
So we should skip dragonwell feature tests when the dragonwell version is standard version.