From 80a86c48e33afc4d1f964c407f0441161eeed71d Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 26 May 2022 12:24:46 +1000 Subject: [PATCH] tests/micropython: Make import_mpy_native test run on all architectures. Signed-off-by: Damien George --- ...t_mpy_native_x64.py => import_mpy_native.py} | 17 ++++++++--------- ...tive_x64.py.exp => import_mpy_native.py.exp} | 0 2 files changed, 8 insertions(+), 9 deletions(-) rename tests/micropython/{import_mpy_native_x64.py => import_mpy_native.py} (91%) rename tests/micropython/{import_mpy_native_x64.py.exp => import_mpy_native.py.exp} (100%) diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native.py similarity index 91% rename from tests/micropython/import_mpy_native_x64.py rename to tests/micropython/import_mpy_native.py index 453d81f256..d7da16581b 100644 --- a/tests/micropython/import_mpy_native_x64.py +++ b/tests/micropython/import_mpy_native.py @@ -1,15 +1,17 @@ -# test importing of .mpy files with native code (x64 only) +# test importing of .mpy files with native code try: import usys, uio, uos + usys.implementation._mpy uio.IOBase uos.mount except (ImportError, AttributeError): print("SKIP") raise SystemExit -if not (usys.platform == "linux" and usys.maxsize > 2**32): +mpy_arch = usys.implementation._mpy >> 8 +if mpy_arch == 0: print("SKIP") raise SystemExit @@ -49,15 +51,14 @@ class UserFS: # these are the test .mpy files +valid_header = bytes([77, 6, mpy_arch, 31]) # fmt: off user_files = { # bad architecture - '/mod0.mpy': b'M\x06\xfc\x00\x10', + '/mod0.mpy': b'M\x06\xfc\x1f', # test loading of viper and asm - '/mod1.mpy': ( - b'M\x06\x08\x1f' # header - + '/mod1.mpy': valid_header + ( b'\x02' # n_qstr b'\x00' # n_obj @@ -84,9 +85,7 @@ user_files = { ), # test loading viper with additional scope flags and relocation - '/mod2.mpy': ( - b'M\x06\x08\x1f' # header - + '/mod2.mpy': valid_header + ( b'\x02' # n_qstr b'\x00' # n_obj diff --git a/tests/micropython/import_mpy_native_x64.py.exp b/tests/micropython/import_mpy_native.py.exp similarity index 100% rename from tests/micropython/import_mpy_native_x64.py.exp rename to tests/micropython/import_mpy_native.py.exp