Skip to content

Commit 1b62215

Browse files
authored
Merge pull request #20693 from BradleyWood/test_schema
Fix paths to playlist.xml schema file
2 parents db897b1 + 8191935 commit 1b62215

File tree

98 files changed

+98
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+98
-98
lines changed

test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Adding a testNG test as an example:
7171
- update testng.xml to add the test class to a existing <test> or
7272
create a new <test>
7373
- If the new <test> is created in testng.xml, playlist.xml should
74-
be updated to add the new <test> based on [playlist.xsd](./TKG/playlist.xsd)
74+
be updated to add the new <test> based on [playlist.xsd](./TKG/resources/playlist.xsd)
7575
Supported test groups are `functional|system|openjdk|external|perf|jck`.
7676
It is required to provide one group per test in playlist.xml.
7777
- adding additional new test methods for new Java10 functionality

test/docs/OpenJ9TestUserGuide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Please read [DependentLibs.md](./DependentLibs.md) for details.
102102
- If you have added new features to OpenJ9, you will likely need to add new tests. Check out [openj9/test/functional/TestExample/src/org/openj9/test/MyTest.java](https://github.com/eclipse-openj9/openj9/blob/master/test/functional/TestExample/src/org/openj9/test/example/MyTest.java) for
103103
the format to use.
104104

105-
- If you have many new test cases to add and special build requirements, then you may want to copy the [TestExample](https://github.com/eclipse-openj9/openj9/blob/master/test/functional/TestExample) update the build.xml and playlist.xml files to match your new Test class names. The playlist.xml format is defined in TKG/playlist.xsd.
105+
- If you have many new test cases to add and special build requirements, then you may want to copy the [TestExample](https://github.com/eclipse-openj9/openj9/blob/master/test/functional/TestExample) update the build.xml and playlist.xml files to match your new Test class names. The playlist.xml format is defined in TKG/resources/playlist.xsd.
106106

107107
- A test can be tagged with following elements:
108108

test/functional/CacheManagement/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<include>CacheManagement.mk</include>
2525
<test>
2626
<testCaseName>testSCCacheManagement</testCaseName>

test/functional/DDR_Test/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OpenJDK Assembly Exception [2].
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>testDDRExt_General</testCaseName>
2626
<command>cp $(TEST_RESROOT)$(D)tck_ddrext.xml .; \

test/functional/HealthCenter/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OpenJDK Assembly Exception [2].
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>HealthCenter_sanity</testCaseName>
2626
<command>ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_JDK_HOME=${TEST_JDK_HOME} -f $(Q)$(TEST_RESROOT)$(D)healthcenter.xml$(Q); $(TEST_STATUS)</command>

test/functional/IllegalAccessError_for_protected_method/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>IllegalAccessProtectedMethodTest_hs</testCaseName>
2626
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \

test/functional/JIT_Test/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OpenJDK Assembly Exception [2].
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<!-- jit.test.jitt tests start here -->
2525
<test>
2626
<testCaseName>finalizerTest</testCaseName>

test/functional/JLM_Tests/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OpenJDK Assembly Exception [2].
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>JLM_Tests_interface_SE80</testCaseName>
2626
<variations>

test/functional/Java10andUp/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>StackWalkerTestJava10</testCaseName>
2626
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \

test/functional/Java11andUp/playlist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
2121
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
-->
23-
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
23+
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
2424
<test>
2525
<testCaseName>String_CompactStrings</testCaseName>
2626
<variations>

0 commit comments

Comments
 (0)