Merge pull request ibmruntimes#148 from andrew-m-leonard/test_fixes

Resolve various testcase encoding issues
keithc-ca · Nov 25, 2019 · 01090db · 01090db
2 parents c2d1478 + 2aa82dd
commit 01090db
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 814 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -31,6 +31,8 @@ speech2* git-encoding=iso8859-1 working-tree-encoding=iso8859-1
 
 # test java files that need to be in UTF-8 as they are compiled as UTF-8
 test/jdk/java/text/Format/DateFormat/Bug8139572.java git-encoding=UTF-8 working-tree-encoding=UTF-8
+test/jdk/java/util/regex/GraphemeBreakProperty.txt git-encoding=UTF-8 working-tree-encoding=UTF-8 
+test/jdk/java/util/regex/GraphemeBreakTest.txt git-encoding=UTF-8 working-tree-encoding=UTF-8
 
 # git's files (which MUST be ASCII)
 .gitattributes git-encoding=iso8859-1 working-tree-encoding=iso8859-1

diff --git a/src/java.base/share/classes/com/ibm/jvm/io/ConsoleInputStream.java b/src/java.base/share/classes/com/ibm/jvm/io/ConsoleInputStream.java
diff --git a/src/java.base/share/classes/com/ibm/jvm/io/LocalizedInputStream.java b/src/java.base/share/classes/com/ibm/jvm/io/LocalizedInputStream.java