windows: Correctly interpret skipped tests, enable uhashlib and ubinascii

stinos · pfalcon · commit f5efefd5a0ba · 2014-12-20T16:52:22.000+02:00
diff --git a/tests/run-tests b/tests/run-tests
@@ -73,7 +73,6 @@ def run_tests(pyb, tests, args):
     # Some tests use unsupported features on Windows
     if os.name == 'nt':
         skip_tests.add('import\\import_file.py') #works but CPython prints forward slashes
-        skip_tests.add('unix\\ffi_float.py')
 
     # Some tests are known to fail with native emitter
     # Remove them from the below when they work
@@ -122,7 +121,7 @@ def run_tests(pyb, tests, args):
         # run Micro Python
         output_mupy = run_micropython(pyb, args, test_file)
 
-        if output_mupy == b'SKIP\n':
+        if output_mupy == b'SKIP\n' or output_mupy == b'SKIP\r\n':
             print("skip ", test_file)
             skipped_tests.append(test_name)
             continue
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
@@ -64,6 +64,8 @@
 #define MICROPY_PY_UJSON            (1)
 #define MICROPY_PY_URE              (1)
 #define MICROPY_PY_UHEAPQ           (1)
+#define MICROPY_PY_UHASHLIB         (1)
+#define MICROPY_PY_UBINASCII        (1)
 
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
 #ifdef _MSC_VER
