diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile index aac7ce73b8..65ef856472 100644 --- a/ports/minimal/Makefile +++ b/ports/minimal/Makefile @@ -74,7 +74,7 @@ else all: $(BUILD)/firmware.elf endif -$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h +$(BUILD)/_frozen_mpy.c: $(TOP)/tests/assets/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 949980f540..cc39040e4b 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: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h +$(BUILD)/_frozen_mpy.c: $(TOP)/tests/assets/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/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py index 37f2531a84..2d459103ef 100644 --- a/ports/unix/variants/coverage/manifest.py +++ b/ports/unix/variants/coverage/manifest.py @@ -1,5 +1,5 @@ add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi") freeze_as_str("frzstr") freeze_as_mpy("frzmpy") -freeze_mpy("$(MPY_DIR)/tests/frozen") +freeze_mpy("$(MPY_DIR)/tests/assets") require("ssl") diff --git a/tests/frozen/README.md b/tests/assets/README.md similarity index 100% rename from tests/frozen/README.md rename to tests/assets/README.md diff --git a/tests/frozen/frozentest.mpy b/tests/assets/frozentest.mpy similarity index 100% rename from tests/frozen/frozentest.mpy rename to tests/assets/frozentest.mpy diff --git a/tests/frozen/frozentest.py b/tests/assets/frozentest.py similarity index 100% rename from tests/frozen/frozentest.py rename to tests/assets/frozentest.py diff --git a/tools/ci.sh b/tools/ci.sh index 063188fe9f..81006ea4e7 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -158,7 +158,7 @@ function ci_mpy_format_setup { function ci_mpy_format_test { # Test mpy-tool.py dump feature on bytecode - python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy + python3 ./tools/mpy-tool.py -xd tests/assets/frozentest.mpy # Build MicroPython ci_unix_standard_build @@ -167,7 +167,7 @@ function ci_mpy_format_test { export MICROPYPATH=. # Test mpy-tool.py running under MicroPython - $micropython ./tools/mpy-tool.py -x -d tests/frozen/frozentest.mpy + $micropython ./tools/mpy-tool.py -x -d tests/assets/frozentest.mpy # Test mpy-tool.py dump feature on native code make -C examples/natmod/features1