Merge pull request #3900 from llxia/test4

set javac encoding
eclipse-openj9 · Dec 3, 2018 · c95f176 · c95f176
2 parents 1e386d4 + 47aa68f
commit c95f176
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/build.xml b/test/functional/cmdLineTests/URLClassLoaderTests/build.xml
@@ -34,6 +34,14 @@
 	<property name="src" location="."/>
 	<property name="build.dir" location="./bin"/>
 
+	<!-- on zos, ant <copy> does not keep file tag. Therefore, ant copied files 
+	cannot be read by javac. Preset javac with encoding="ISO-8859-1" so that files 
+	without proper tagging can be read.
+	-->
+	<presetdef name="javac">
+		<javac encoding="ISO-8859-1" />
+	</presetdef>
+
 	<target name="init">
 		<mkdir dir="${DEST}" />
 		<mkdir dir="${build.dir}" />

diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml b/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml
@@ -36,6 +36,14 @@
 
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/shareClassTests/testClasses" />
 
+	<!-- on zos, ant <copy> does not keep file tag. Therefore, ant copied files 
+	cannot be read by javac. Preset javac with encoding="ISO-8859-1" so that files 
+	without proper tagging can be read.
+	-->
+	<presetdef name="javac">
+		<javac encoding="ISO-8859-1" />
+	</presetdef>
+
 	<target name="AddTestClassesToPackage">
 		<!-- create the folders -->
 		<mkdir dir="${build}/Alphabet" />