From 65e79edbe3a365ac0b7fcecb8126ace8f6a39c28 Mon Sep 17 00:00:00 2001 From: "Mesbah_Alam@ca.ibm.com" Date: Wed, 9 Oct 2019 16:04:42 -0400 Subject: [PATCH] Use encoding ISO-8859-1 for compiling system tests Signed-off-by: Mesbah_Alam@ca.ibm.com --- openjdk.test.classloading/build.xml | 6 +++--- openjdk.test.concurrent/build.xml | 2 +- openjdk.test.debugging/build.xml | 2 +- openjdk.test.gc/build.xml | 2 +- openjdk.test.jck/build.xml | 2 +- openjdk.test.jlm/build.xml | 2 +- openjdk.test.lambdasAndStreams/build.xml | 2 +- openjdk.test.lang/build.xml | 2 +- openjdk.test.load/build.xml | 2 +- openjdk.test.locking/build.xml | 2 +- openjdk.test.math/build.xml | 2 +- openjdk.test.mauve/build.xml | 4 ++-- openjdk.test.nio/build.xml | 4 ++-- .../test/nio2/perl/filesystems/generateProviders.pl | 4 ++-- openjdk.test.serialization/build.xml | 2 +- openjdk.test.util/build.xml | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/openjdk.test.classloading/build.xml b/openjdk.test.classloading/build.xml index 386c0132..fb2f36f7 100644 --- a/openjdk.test.classloading/build.xml +++ b/openjdk.test.classloading/build.xml @@ -94,7 +94,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> @@ -113,7 +113,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpath="${openjdk_test_classloading_src_dir}/notonclasspath/url2" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> @@ -125,7 +125,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpath="${openjdk_test_classloading_src_dir}/notonclasspath/url1" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.concurrent/build.xml b/openjdk.test.concurrent/build.xml index 6f60138e..4c51f7a4 100644 --- a/openjdk.test.concurrent/build.xml +++ b/openjdk.test.concurrent/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.debugging/build.xml b/openjdk.test.debugging/build.xml index 771a91f9..ebff258f 100644 --- a/openjdk.test.debugging/build.xml +++ b/openjdk.test.debugging/build.xml @@ -110,7 +110,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.gc/build.xml b/openjdk.test.gc/build.xml index a2464b30..705b9f10 100644 --- a/openjdk.test.gc/build.xml +++ b/openjdk.test.gc/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.jck/build.xml b/openjdk.test.jck/build.xml index 03edaf95..f72686c7 100644 --- a/openjdk.test.jck/build.xml +++ b/openjdk.test.jck/build.xml @@ -96,7 +96,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.jlm/build.xml b/openjdk.test.jlm/build.xml index ccdb2a1b..42b10455 100644 --- a/openjdk.test.jlm/build.xml +++ b/openjdk.test.jlm/build.xml @@ -84,7 +84,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.lambdasAndStreams/build.xml b/openjdk.test.lambdasAndStreams/build.xml index c67d92d2..a3f8f575 100644 --- a/openjdk.test.lambdasAndStreams/build.xml +++ b/openjdk.test.lambdasAndStreams/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.lang/build.xml b/openjdk.test.lang/build.xml index 18d0ab3b..7b3709ec 100644 --- a/openjdk.test.lang/build.xml +++ b/openjdk.test.lang/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.load/build.xml b/openjdk.test.load/build.xml index 9224f6cb..9bda0ea1 100644 --- a/openjdk.test.load/build.xml +++ b/openjdk.test.load/build.xml @@ -83,7 +83,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.locking/build.xml b/openjdk.test.locking/build.xml index 2e388957..9a66fedc 100644 --- a/openjdk.test.locking/build.xml +++ b/openjdk.test.locking/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.math/build.xml b/openjdk.test.math/build.xml index 84b22d2b..6f4f95d3 100644 --- a/openjdk.test.math/build.xml +++ b/openjdk.test.math/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.mauve/build.xml b/openjdk.test.mauve/build.xml index e738834c..c36ec452 100644 --- a/openjdk.test.mauve/build.xml +++ b/openjdk.test.mauve/build.xml @@ -116,7 +116,7 @@ limitations under the License. executable="${java_compiler}" classpathref="project.class.path" debug="true" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> @@ -150,7 +150,7 @@ limitations under the License. executable="${java_compiler}" classpathref="project.class.path" debug="true" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.nio/build.xml b/openjdk.test.nio/build.xml index 14c02f70..e6692789 100644 --- a/openjdk.test.nio/build.xml +++ b/openjdk.test.nio/build.xml @@ -100,7 +100,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" failonerror="true"> @@ -154,7 +154,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.nio/src/test.nio/net/adoptopenjdk/test/nio2/perl/filesystems/generateProviders.pl b/openjdk.test.nio/src/test.nio/net/adoptopenjdk/test/nio2/perl/filesystems/generateProviders.pl index 5cea9774..623a16d3 100644 --- a/openjdk.test.nio/src/test.nio/net/adoptopenjdk/test/nio2/perl/filesystems/generateProviders.pl +++ b/openjdk.test.nio/src/test.nio/net/adoptopenjdk/test/nio2/perl/filesystems/generateProviders.pl @@ -39,11 +39,11 @@ my $numberOfProvidersToCreate = 1000; # To create the file required for the JVM to know about the SPI Providers -open SERVICES, ">:encoding(UTF-8)", $services_file or die "Unable to open services file - $services_file"; +open SERVICES, ">:encoding(ISO-8859-1)", $services_file or die "Unable to open services file - $services_file"; for (my $counter = 0; $counter < $numberOfProvidersToCreate; $counter++) { - open OUTPUT_FILE, ">:encoding(UTF-8)",catfile("$Bin", "..","..","filesystem","MemoryFileSystemProviderImpl${counter}.java"); + open OUTPUT_FILE, ">:encoding(ISO-8859-1)",catfile("$Bin", "..","..","filesystem","MemoryFileSystemProviderImpl${counter}.java"); # Update the file contents with the right counter value my $iterationContents = $templateContents; diff --git a/openjdk.test.serialization/build.xml b/openjdk.test.serialization/build.xml index 9d553bcb..4542cb3b 100644 --- a/openjdk.test.serialization/build.xml +++ b/openjdk.test.serialization/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true"> diff --git a/openjdk.test.util/build.xml b/openjdk.test.util/build.xml index e94e552a..c3b240dc 100644 --- a/openjdk.test.util/build.xml +++ b/openjdk.test.util/build.xml @@ -89,7 +89,7 @@ limitations under the License. executable="${java_compiler}" debug="true" classpathref="project.class.path" - encoding="${src-encoding}" + encoding="ISO-8859-1" includeantruntime="false" failonerror="true">