diff --git a/test/threadx/CMakeLists.txt b/test/threadx/CMakeLists.txt index 6264350..724ddc2 100644 --- a/test/threadx/CMakeLists.txt +++ b/test/threadx/CMakeLists.txt @@ -5,23 +5,6 @@ set(TX_CMAKE_DIR ${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/cmake ) -# This test needs a local test_interrupt_dispatch() because it does not link testcontrol.c. -set(TX_KERNEL_SETUP_TEST_SOURCE_INPUT ${THREADX4TGFS_ROOT}/third-party/threadx/test/tx/regression/threadx_initialize_kernel_setup_test.c) -set(TX_KERNEL_SETUP_TEST_SOURCE ${CMAKE_BINARY_DIR}/generated/threadx_initialize_kernel_setup_test.c) -add_custom_command( - OUTPUT ${TX_KERNEL_SETUP_TEST_SOURCE} - COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh - ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT} - ${TX_KERNEL_SETUP_TEST_SOURCE} - DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE_INPUT} - ${CMAKE_CURRENT_LIST_DIR}/generate_kernel_setup_test_file.sh - VERBATIM -) -add_custom_target(threadx_regression_generated_kernel_setup_test - DEPENDS ${TX_KERNEL_SETUP_TEST_SOURCE} -) -set_source_files_properties(${TX_KERNEL_SETUP_TEST_SOURCE} PROPERTIES GENERATED TRUE) - set(TX_REGRESSION_CASES ${TX_REGRESSION_DIR}/threadx_block_memory_basic_test.c ${TX_REGRESSION_DIR}/threadx_block_memory_error_detection_test.c @@ -118,7 +101,7 @@ set(TX_REGRESSION_CASES ${TX_REGRESSION_DIR}/threadx_timer_multiple_test.c ${TX_REGRESSION_DIR}/threadx_timer_simple_test.c ${TX_REGRESSION_DIR}/threadx_trace_basic_test.c - ${TX_KERNEL_SETUP_TEST_SOURCE} + ${TX_REGRESSION_DIR}/threadx_initialize_kernel_setup_test.c ) set(TX_REGRESSION_TARGETS) @@ -153,9 +136,6 @@ function(add_threadx_regression_test TEST_SOURCE) SOURCES ${TEST_SOURCE} ) - if(TEST_NAME STREQUAL "threadx_initialize_kernel_setup_test") - add_dependencies(${TEST_NAME} threadx_regression_generated_kernel_setup_test) - endif() list(APPEND TX_REGRESSION_TARGETS ${TEST_NAME}) set(TX_REGRESSION_TARGETS ${TX_REGRESSION_TARGETS} PARENT_SCOPE) diff --git a/test/threadx/generate_kernel_setup_test_file.sh b/test/threadx/generate_kernel_setup_test_file.sh deleted file mode 100755 index 01dc5cc..0000000 --- a/test/threadx/generate_kernel_setup_test_file.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eu - -src="$1" -dst="$2" - -anchor='void tx_application_define(void *first_unused_memory){}' - -line=$(grep -n -F "$anchor" "$src" | head -n 1 | cut -d: -f1) -if [ -z "$line" ]; then - echo "failed to find tx_application_define anchor in kernel setup test source" >&2 - exit 1 -fi -mkdir -p "$(dirname "$dst")" -sed "${line}a\\ -void test_interrupt_dispatch(void){}" "$src" > "$dst"