Skip to content

Commit 5a03ab3

Browse files
authored
Pass -Dfile.encoding=UTF-8 for z/OS (adoptium#3307)
Signed-off-by: Mesbah-Alam <[email protected]>
1 parent 59d77dd commit 5a03ab3

File tree

3 files changed

+4
-30
lines changed

3 files changed

+4
-30
lines changed

jck/jtrunner/JavaTestRunner.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ public static boolean jckConfigurationForMultijvmWithNoAgent() throws Exception
466466
concurrency = Runtime.getRuntime().availableProcessors() + 1;
467467
concurrencyString = String.valueOf(concurrency);
468468
}
469+
470+
if (platform.contains("zos")) {
471+
extraJvmOptions += " -Dfile.encoding=UTF-8";
472+
}
469473

470474
// Set the operating system as 'Windows' for Windows and 'other' for all other operating systems.
471475
// If 'other' is specified when executing on Windows, then Windows specific settings such

jck/runtime.api/playlist.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,6 @@
275275
</test>
276276
<test>
277277
<testCaseName>jck-runtime-api-java_lang-Class</testCaseName>
278-
<disables>
279-
<disable>
280-
<comment>Temporarily disabled on z/OS for backlog/issues/666</comment>
281-
<platform>.*zos.*</platform>
282-
<impl>ibm</impl>
283-
<version>11</version>
284-
</disable>
285-
</disables>
286278
<variations>
287279
<variation>NoOptions</variation>
288280
</variations>
@@ -536,14 +528,6 @@
536528
</test>
537529
<test>
538530
<testCaseName>jck-runtime-api-java_lang</testCaseName>
539-
<disables>
540-
<disable>
541-
<comment>Temporarily disabled on z/OS for backlog/issues/669</comment>
542-
<platform>.*zos.*</platform>
543-
<impl>ibm</impl>
544-
<version>11</version>
545-
</disable>
546-
</disables>
547531
<variations>
548532
<variation>NoOptions</variation>
549533
</variations>
@@ -683,12 +667,6 @@
683667
<version>17</version>
684668
<impl>openj9</impl>
685669
</disable>
686-
<disable>
687-
<comment>Temporarily disabled on z/OS for backlog/issues/680</comment>
688-
<platform>.*zos.*</platform>
689-
<impl>ibm</impl>
690-
<version>11</version>
691-
</disable>
692670
</disables>
693671
<variations>
694672
<variation>NoOptions</variation>

jck/runtime.vm/playlist.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,6 @@
136136
</test>
137137
<test>
138138
<testCaseName>jck-runtime-vm-module</testCaseName>
139-
<disables>
140-
<disable>
141-
<comment>Temporarily disabled on z/OS for backlog/issues/583</comment>
142-
<platform>.*zos.*</platform>
143-
<impl>ibm</impl>
144-
<version>11</version>
145-
</disable>
146-
</disables>
147139
<variations>
148140
<variation>NoOptions</variation>
149141
</variations>

0 commit comments

Comments
 (0)