Skip to content

Commit

Permalink
Merge pull request #301 from Mesbah-Alam/use_encoding-ISO-8859-1
Browse files Browse the repository at this point in the history
WIP Use encoding ISO-8859-1 for compiling system tests
  • Loading branch information
Mesbah-Alam authored Oct 10, 2019
2 parents 4c0a58a + 65e79ed commit f6d675b
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions openjdk.test.classloading/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand All @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand All @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.concurrent/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.debugging/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.gc/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.jck/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.jlm/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.lambdasAndStreams/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.lang/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.load/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.locking/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.math/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
4 changes: 2 additions & 2 deletions openjdk.test.mauve/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="**/*.java" />
Expand Down Expand Up @@ -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">
<include name="*.java" />
Expand Down
4 changes: 2 additions & 2 deletions openjdk.test.nio/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<include name="net/adoptopenjdk/test/nio2/filesystem/**"/>
</javac>
Expand Down Expand Up @@ -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">
<include name="**/*.java"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.serialization/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down
2 changes: 1 addition & 1 deletion openjdk.test.util/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<compilerarg value="-Xlint:deprecation,unchecked" />
Expand Down

0 comments on commit f6d675b

Please sign in to comment.