YourWishes/dusk
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load duskscript files through the asset system, not the real filesystem

Browse Source 
scriptLoadHandler used fopen/fread directly, but every .ds a script include()s
is packed into dusk.dsk (compiled to .dsb) like every other asset now, not a
loose file next to the binary - raw filesystem reads never found them outside
a dev checkout. It now goes through assetFileInit/Open/Read/Close like the
rest of the engine's asset loaders, failing the load the same way (returning
SCRIPT_LOAD_FAILED) for a missing entry or one bigger than capacity.

test_duskscript's fixtures moved to their own assets/ subfolder and pack into
a small test.dsk with the same tools.asset.pack used for the real dusk.dsk,
and the test opens that archive straight into ASSET.zip (skipping the full
assetInit()/assetInitPlatform(), which expects a launched engine) so the
tests exercise the real compile -> pack -> asset -> runtime pipeline instead
of a filesystem shortcut around it.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
This commit is contained in:
YourWishesandClaude Sonnet 5 committed 2026-10-14 22:33:46 -05:00
1 parent 5cf0678429
commit a0294aae98
5 files changed
+70 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/duskscript/CMakeLists.txt
+22 -19
View File
@@ -7,29 +7,32 @@ include(dusktest)
dusktest(test_duskscript.c)
# Compile the fixture scripts to bytecode with duskscriptcc at build time, so
# the test exercises the real compiler -> runtime -> consolePrint pipeline.
set(DUSKSCRIPT_TEST_FIXTURE_DS ${CMAKE_CURRENT_LIST_DIR}/fixture.ds)
set(DUSKSCRIPT_TEST_FIXTURE_DSB ${CMAKE_CURRENT_BINARY_DIR}/fixture.dsb)
set(DUSKSCRIPT_TEST_NUMBERS_DS ${CMAKE_CURRENT_LIST_DIR}/fixture_numbers.ds)
set(DUSKSCRIPT_TEST_NUMBERS_DSB ${CMAKE_CURRENT_BINARY_DIR}/fixture_numbers.dsb)
# Scripts are loaded through the asset system (see scriptLoadHandler in
# src/dusk/script/script.c), not the real filesystem, so the fixtures are
# packed into a small test.dsk with the same tools.asset.pack used for the
# game's own dusk.dsk - this exercises the real compiler -> pack -> asset ->
# runtime -> consolePrint pipeline rather than a shortcut around it.
set(DUSKSCRIPT_TEST_ASSETS_DIR ${CMAKE_CURRENT_LIST_DIR}/assets)
set(DUSKSCRIPT_TEST_DSK ${CMAKE_CURRENT_BINARY_DIR}/test.dsk)
add_custom_command(
OUTPUT ${DUSKSCRIPT_TEST_FIXTURE_DSB}
COMMAND duskscriptcc ${DUSKSCRIPT_TEST_FIXTURE_DS} -o ${DUSKSCRIPT_TEST_FIXTURE_DSB}
DEPENDS duskscriptcc ${DUSKSCRIPT_TEST_FIXTURE_DS}
COMMENT "Compiling duskscript test fixture"
OUTPUT ${DUSKSCRIPT_TEST_DSK}
COMMAND ${Python3_EXECUTABLE} -m tools.asset.pack
--input ${DUSKSCRIPT_TEST_ASSETS_DIR}
--output ${DUSKSCRIPT_TEST_DSK}
--duskscriptcc "$<TARGET_FILE:duskscriptcc>"
WORKING_DIRECTORY ${DUSK_ROOT_DIR}
DEPENDS
duskscriptcc
${DUSKSCRIPT_TEST_ASSETS_DIR}/fixture.ds
${DUSKSCRIPT_TEST_ASSETS_DIR}/fixture_numbers.ds
COMMENT "Packing duskscript test fixtures"
)
add_custom_command(
OUTPUT ${DUSKSCRIPT_TEST_NUMBERS_DSB}
COMMAND duskscriptcc ${DUSKSCRIPT_TEST_NUMBERS_DS} -o ${DUSKSCRIPT_TEST_NUMBERS_DSB}
DEPENDS duskscriptcc ${DUSKSCRIPT_TEST_NUMBERS_DS}
COMMENT "Compiling duskscript numbers test fixture"
)
add_custom_target(duskscript_test_fixture DEPENDS ${DUSKSCRIPT_TEST_FIXTURE_DSB} ${DUSKSCRIPT_TEST_NUMBERS_DSB})
add_custom_target(duskscript_test_fixture DEPENDS ${DUSKSCRIPT_TEST_DSK})
add_dependencies(test_duskscript duskscript_test_fixture)
target_compile_definitions(test_duskscript PRIVATE
DUSKSCRIPT_TEST_FIXTURE="${DUSKSCRIPT_TEST_FIXTURE_DSB}"
DUSKSCRIPT_TEST_NUMBERS="${DUSKSCRIPT_TEST_NUMBERS_DSB}"
DUSKSCRIPT_TEST_DSK="${DUSKSCRIPT_TEST_DSK}"
DUSKSCRIPT_TEST_FIXTURE="fixture.dsb"
DUSKSCRIPT_TEST_NUMBERS="fixture_numbers.dsb"
)