diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2022-09-19 12:03:38 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-09-19 23:51:10 +1000 |
| commit | 6ecdf1a240e43bd60c824c7efd575c0a82d02d7e (patch) | |
| tree | 5d987a8b9c4cd93f0bc2326eebb6bf7b6516e1b1 | |
| parent | 9ae8d3820474a9525d707b1e19f7703721aec1c8 (diff) | |
tests/frozen: Move frozentest.mpy from ports/ to tests/.
frozentest.mpy was previously duplicated in ports/minimal and
ports/powerpc.
This needs to be re-generated on every .mpy version increase, so might as
well just have a single copy of it.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
| -rw-r--r-- | ports/minimal/Makefile | 2 | ||||
| -rw-r--r-- | ports/powerpc/Makefile | 2 | ||||
| -rw-r--r-- | ports/powerpc/frozentest.mpy | bin | 196 -> 0 bytes | |||
| -rw-r--r-- | ports/powerpc/frozentest.py | 7 | ||||
| -rw-r--r-- | tests/frozen/README.md | 2 | ||||
| -rw-r--r-- | tests/frozen/frozentest.mpy (renamed from ports/minimal/frozentest.mpy) | bin | 196 -> 196 bytes | |||
| -rw-r--r-- | tests/frozen/frozentest.py (renamed from ports/minimal/frozentest.py) | 0 | ||||
| -rwxr-xr-x | tools/ci.sh | 4 |
8 files changed, 6 insertions, 11 deletions
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile index 5ba6514c9..0e875cc24 100644 --- a/ports/minimal/Makefile +++ b/ports/minimal/Makefile @@ -81,7 +81,7 @@ else all: $(BUILD)/firmware.elf endif -$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h +$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h $(ECHO) "MISC freezing bytecode" $(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@ diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile index 12ae485bb..0986fd13e 100644 --- a/ports/powerpc/Makefile +++ b/ports/powerpc/Makefile @@ -50,7 +50,7 @@ OBJ += $(BUILD)/head.o all: $(BUILD)/firmware.elf $(BUILD)/firmware.map $(BUILD)/firmware.bin -$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h +$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h $(ECHO) "MISC freezing bytecode" $(Q)$(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=mpz $< > $@ diff --git a/ports/powerpc/frozentest.mpy b/ports/powerpc/frozentest.mpy Binary files differdeleted file mode 100644 index 99581617a..000000000 --- a/ports/powerpc/frozentest.mpy +++ /dev/null diff --git a/ports/powerpc/frozentest.py b/ports/powerpc/frozentest.py deleted file mode 100644 index 78cdd60bf..000000000 --- a/ports/powerpc/frozentest.py +++ /dev/null @@ -1,7 +0,0 @@ -print("uPy") -print("a long string that is not interned") -print("a string that has unicode αβγ chars") -print(b"bytes 1234\x01") -print(123456789) -for i in range(4): - print(i) diff --git a/tests/frozen/README.md b/tests/frozen/README.md new file mode 100644 index 000000000..bd786d5a3 --- /dev/null +++ b/tests/frozen/README.md @@ -0,0 +1,2 @@ +This is a .mpy built against the current .mpy version that can be used to test +freezing without a dependency on mpy-cross. diff --git a/ports/minimal/frozentest.mpy b/tests/frozen/frozentest.mpy Binary files differindex 99581617a..99581617a 100644 --- a/ports/minimal/frozentest.mpy +++ b/tests/frozen/frozentest.mpy diff --git a/ports/minimal/frozentest.py b/tests/frozen/frozentest.py index 78cdd60bf..78cdd60bf 100644 --- a/ports/minimal/frozentest.py +++ b/tests/frozen/frozentest.py diff --git a/tools/ci.sh b/tools/ci.sh index 9c670b7be..9963f7796 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -75,8 +75,8 @@ function ci_mpy_format_setup { function ci_mpy_format_test { # Test mpy-tool.py dump feature on bytecode - python2 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy - python3 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy + python2 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy + python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy # Test mpy-tool.py dump feature on native code make -C examples/natmod/features1 |