Merge pull request #3 from adafruit/master

Add latest changes on repo

2 files changed, 21 insertions, 2 deletions

diff --git a/tools/print_status.py b/tools/print_status.py
new file mode 100755
index 000000000..ed563fd68
--- /dev/null
+++ b/tools/print_status.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+import sys
+if len(sys.argv) != 2:
+    print("""\
+Usage: print_status.py STATUS_FILENAME
+    STATUS_FILENAME contains one line with an integer status."""
+    )
+    sys.exit(1)
+with open(sys.argv[1], 'r') as status_in:
+    status = int(status_in.readline())
+
+print('{} with status {}'.format(
+    "\033[32msucceeded\033[0m" if status == 0 else "\033[31mfailed\033[0m",
+    status))
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index 7f14db4ba..7a48f8a9a 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -23,7 +23,7 @@ def chew_filename(t):
 
 def script_to_map(test_file):
     r = {"name": chew_filename(test_file)["func"]}
-    with open(t) as test:
+    with open(test_file, "rb") as test:
         script = test.readlines()
 
     # Test for import skip_if and inject it into the test as needed.
@@ -39,7 +39,11 @@ def script_to_map(test_file):
             continue
           script.insert(index + total_lines, "\t" + line)
           total_lines += 1
-    r['script'] = escape(''.join(script))
+    r['script'] = escape(b''.join(script))
+
+    with open(test_file + ".exp", "rb") as f:
+        r["output"] = escape(f.read())
+
     return r
 
 test_function = (