TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

unix/main: Add coverage test for mounting ROMFS filesystem at startup.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-03-04 22:46:33 +11:00
parent 6bec36a4ee
commit be0fce9429
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ports/unix/main.c
View File

@@ -45,6 +45,7 @@
#include "py/gc.h" #include "py/gc.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/cstack.h" #include "py/cstack.h"
#include "py/mperrno.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "py/mpthread.h" #include "py/mpthread.h"
#include "extmod/misc.h" #include "extmod/misc.h"
@@ -548,7 +549,14 @@ MP_NOINLINE int main_(int argc, char **argv) {
MP_OBJ_NEW_QSTR(MP_QSTR__slash_), MP_OBJ_NEW_QSTR(MP_QSTR__slash_),
}; };
mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map); mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
// Make sure the root that was just mounted is the current VFS (it's always at
// the end of the linked list). Can't use chdir('/') because that will change
// the current path within the VfsPosix object.
MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table); MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table);
while (MP_STATE_VM(vfs_cur)->next != NULL) {
MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_cur)->next;
}
} }
#endif #endif
@@ -803,3 +811,22 @@ void nlr_jump_fail(void *val) {
fprintf(stderr, "FATAL: uncaught NLR %p\n", val); fprintf(stderr, "FATAL: uncaught NLR %p\n", val);
exit(1); exit(1);
} }
#if MICROPY_VFS_ROM_IOCTL
static uint8_t romfs_buf[4] = { 0xd2, 0xcd, 0x31, 0x00 }; // empty ROMFS
static const MP_DEFINE_MEMORYVIEW_OBJ(romfs_obj, 'B', 0, sizeof(romfs_buf), romfs_buf);
mp_obj_t mp_vfs_rom_ioctl(size_t n_args, const mp_obj_t *args) {
switch (mp_obj_get_int(args[0])) {
case MP_VFS_ROM_IOCTL_GET_NUMBER_OF_SEGMENTS:
return MP_OBJ_NEW_SMALL_INT(1);
case MP_VFS_ROM_IOCTL_GET_SEGMENT:
return MP_OBJ_FROM_PTR(&romfs_obj);
}
return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
}
#endif

2
ports/unix/variants/coverage/mpconfigvariant.h
View File

@@ -41,4 +41,6 @@
#define MICROPY_DEBUG_PARSE_RULE_NAME (1) #define MICROPY_DEBUG_PARSE_RULE_NAME (1)
#define MICROPY_TRACKED_ALLOC (1) #define MICROPY_TRACKED_ALLOC (1)
#define MICROPY_WARNINGS_CATEGORY (1) #define MICROPY_WARNINGS_CATEGORY (1)
#undef MICROPY_VFS_ROM_IOCTL
#define MICROPY_VFS_ROM_IOCTL (1)
#define MICROPY_PY_CRYPTOLIB_CTR (1) #define MICROPY_PY_CRYPTOLIB_CTR (1)