Skip to content

Commit 67de20a

Browse files
agattidpgeorge
authored andcommitted
tests: Rename "tests/frozen" into "tests/assets".
This commit renames the "tests/frozen" directory into "tests/assets" to make it more explicit that it does contain files that are needed for other tests to function. Right now there's only a single pre-compiled module being used for miscellaneous tests, but it will soon hold ROMFS test data as well. Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
1 parent 75441f4 commit 67de20a

7 files changed

Lines changed: 5 additions & 5 deletions

File tree

ports/minimal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ else
7474
all: $(BUILD)/firmware.elf
7575
endif
7676

77-
$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
77+
$(BUILD)/_frozen_mpy.c: $(TOP)/tests/assets/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
7878
$(ECHO) "MISC freezing bytecode"
7979
$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@
8080

ports/powerpc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ OBJ += $(BUILD)/head.o
5050

5151
all: $(BUILD)/firmware.elf $(BUILD)/firmware.map $(BUILD)/firmware.bin
5252

53-
$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
53+
$(BUILD)/_frozen_mpy.c: $(TOP)/tests/assets/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
5454
$(ECHO) "MISC freezing bytecode"
5555
$(Q)$(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=mpz $< > $@
5656

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_library("unix-ffi", "$(MPY_LIB_DIR)/unix-ffi")
22
freeze_as_str("frzstr")
33
freeze_as_mpy("frzmpy")
4-
freeze_mpy("$(MPY_DIR)/tests/frozen")
4+
freeze_mpy("$(MPY_DIR)/tests/assets")
55
require("ssl")
File renamed without changes.

tools/ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function ci_mpy_format_setup {
158158

159159
function ci_mpy_format_test {
160160
# Test mpy-tool.py dump feature on bytecode
161-
python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
161+
python3 ./tools/mpy-tool.py -xd tests/assets/frozentest.mpy
162162

163163
# Build MicroPython
164164
ci_unix_standard_build
@@ -167,7 +167,7 @@ function ci_mpy_format_test {
167167
export MICROPYPATH=.
168168

169169
# Test mpy-tool.py running under MicroPython
170-
$micropython ./tools/mpy-tool.py -x -d tests/frozen/frozentest.mpy
170+
$micropython ./tools/mpy-tool.py -x -d tests/assets/frozentest.mpy
171171

172172
# Test mpy-tool.py dump feature on native code
173173
make -C examples/natmod/features1

0 commit comments

Comments
 (0)