updates test to work with new build system

This commit is contained in:
2026-04-10 14:13:18 +02:00
parent 4c15a3e15f
commit d97e71ca83
3 changed files with 28 additions and 29 deletions

View File

@@ -37,27 +37,30 @@ set(__THREAD_LOCAL_STORAGE OFF)
add_subdirectory(${THREADX4TGFS_ROOT}/third-party/picolibc ${CMAKE_BINARY_DIR}/picolibc)
target_link_libraries(c PUBLIC gcc)
set(THREADX_CUSTOM_PORT ${THREADX4TGFS_ROOT}/port/threadx)
add_subdirectory(${THREADX4TGFS_ROOT}/third-party/threadx ${CMAKE_BINARY_DIR}/threadx)
target_link_libraries(threadx PUBLIC c)
target_compile_definitions(threadx PUBLIC TX_REGRESSION_TEST)
set(MOONLIGHT_TRAP_SOURCE_INPUT ${THREADX4TGFS_ROOT}/port/moonlight/src/trap_non_vectored.c)
set(MOONLIGHT_TRAP_SOURCE ${CMAKE_BINARY_DIR}/generated/trap_non_vectored.c)
add_custom_command(
OUTPUT ${MOONLIGHT_TRAP_SOURCE}
set(THREADX_LOW_LEVEL_INIT_SOURCE_INPUT
${THREADX4TGFS_ROOT}/port/threadx/src/tx_initialize_low_level.c)
set(THREADX_LOW_LEVEL_INIT_SOURCE
${CMAKE_BINARY_DIR}/generated/tx_initialize_low_level.c)
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
${THREADX_LOW_LEVEL_INIT_SOURCE_INPUT}
${CMAKE_CURRENT_LIST_DIR}/generate_trap_file.sh)
execute_process(
COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_trap_file.sh
${MOONLIGHT_TRAP_SOURCE_INPUT}
${MOONLIGHT_TRAP_SOURCE}
DEPENDS ${MOONLIGHT_TRAP_SOURCE_INPUT}
${CMAKE_CURRENT_LIST_DIR}/generate_trap_file.sh
VERBATIM
${THREADX_LOW_LEVEL_INIT_SOURCE_INPUT}
${THREADX_LOW_LEVEL_INIT_SOURCE}
RESULT_VARIABLE THREADX_LOW_LEVEL_INIT_GENERATE_RESULT
COMMAND_ERROR_IS_FATAL ANY
)
add_custom_target(threadx_regression_generated_trap DEPENDS ${MOONLIGHT_TRAP_SOURCE})
set_source_files_properties(${MOONLIGHT_TRAP_SOURCE} PROPERTIES GENERATED TRUE)
add_subdirectory(${THREADX4TGFS_ROOT}/port/moonlight ${CMAKE_BINARY_DIR}/port/moonlight)
add_dependencies(moonlight_platform_common threadx_regression_generated_trap)
target_sources(c PRIVATE ${THREADX4TGFS_ROOT}/port/picolibc/port.c)
target_link_libraries(c PUBLIC moonlight gcc)
set(THREADX_CUSTOM_PORT ${THREADX4TGFS_ROOT}/port/threadx)
add_subdirectory(${THREADX4TGFS_ROOT}/third-party/threadx ${CMAKE_BINARY_DIR}/threadx)
target_link_libraries(threadx PUBLIC moonlight c)
target_compile_definitions(threadx PUBLIC TX_REGRESSION_TEST)
function(setup_target TARGET)
set(options)
@@ -72,11 +75,6 @@ function(setup_target TARGET)
set_target_properties(${TARGET} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
if(ST_PLATFORM_TARGET)
target_add_moonlight_platform(${TARGET} PLATFORM_TARGET ${ST_PLATFORM_TARGET})
else()
target_add_moonlight_platform(${TARGET})
endif()
if(ST_SOURCES)
target_sources(${TARGET} PRIVATE ${ST_SOURCES})
@@ -87,10 +85,6 @@ function(setup_target TARGET)
endif()
target_link_options(${TARGET} PRIVATE
-nostartfiles
-nostdlib
-T ${THREADX4TGFS_ROOT}/src/${TARGET_MEM}.lds
-Wl,--gc-sections
-Wl,-Map=${CMAKE_BINARY_DIR}/${TARGET}.map)
add_custom_command(TARGET ${TARGET} POST_BUILD