Merge https://github.com/blmorris/micropython into Myriad2

3 files changed, 14 insertions, 1 deletions

diff --git a/tests/run-tests b/tests/run-tests
index 71a94f946..4b48421de 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -134,7 +134,7 @@ def main():
         if args.test_dirs is None:
             if pyb is None:
                 # run PC tests
-                test_dirs = ('basics', 'micropython', 'float', 'import', 'io', 'misc')
+                test_dirs = ('basics', 'micropython', 'float', 'import', 'io', 'misc', 'unicode')
             else:
                 # run pyboard tests
                 test_dirs = ('basics', 'micropython', 'float', 'pyb', 'pybnative', 'inlineasm')
diff --git a/tests/unicode/data/utf-8_2.txt b/tests/unicode/data/utf-8_2.txt
new file mode 100644
index 000000000..ab0eaa4e0
--- /dev/null
+++ b/tests/unicode/data/utf-8_2.txt
@@ -0,0 +1 @@
+aαbβcγdδ
diff --git a/tests/unicode/file2.py b/tests/unicode/file2.py
new file mode 100644
index 000000000..aca2e0e0e
--- /dev/null
+++ b/tests/unicode/file2.py
@@ -0,0 +1,12 @@
+# test reading a given number of characters
+
+def do(mode):
+    f = open('unicode/data/utf-8_2.txt', mode)
+    print(f.read(1))
+    print(f.read(1))
+    print(f.read(2))
+    print(f.read(4))
+    f.close()
+
+do('rb')
+do('rt')