From c8bcc1b2f6736d1756fcb2a49166ab8c42f7b015 Mon Sep 17 00:00:00 2001 From: TiejunZhou <50469179+TiejunMS@users.noreply.github.com> Date: Fri, 12 Jan 2024 06:06:04 +0000 Subject: [PATCH 1/2] Update links in run.sh script --- test/cmake/usbx/run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cmake/usbx/run.sh b/test/cmake/usbx/run.sh index c9a81ca4..040343f3 100755 --- a/test/cmake/usbx/run.sh +++ b/test/cmake/usbx/run.sh @@ -3,10 +3,10 @@ cd $(dirname $0) # Checkout externals -[ -d externals] || mkdir ../../externals -git clone https://github.com/azure-rtos/threadx.git ../../externals/threadx -git clone https://github.com/azure-rtos/netxduo.git ../../externals/netxduo -git clone https://github.com/azure-rtos/filex.git ../../externals/filex +[ -d externals ] || mkdir ../../externals +git clone https://github.com/eclipse-threadx/threadx.git ../../externals/threadx +git clone https://github.com/eclipse-threadx/netxduo.git ../../externals/netxduo +git clone https://github.com/eclipse-threadx/filex.git ../../externals/filex # Add junit output for ctest generation if ! grep -q "\-\-output\-junit \$1.xml" ../../externals/threadx/scripts/cmake_bootstrap.sh; then From 179e906ee2dab975a4e7a45804f17ec7036a7bda Mon Sep 17 00:00:00 2001 From: TiejunZhou <50469179+TiejunMS@users.noreply.github.com> Date: Fri, 12 Jan 2024 06:58:41 +0000 Subject: [PATCH 2/2] Remove tests for FX exFAT. --- test/cmake/usbx/CMakeLists.txt | 3 +-- test/cmake/usbx/regression/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/cmake/usbx/CMakeLists.txt b/test/cmake/usbx/CMakeLists.txt index dc9f5127..fb2f69f7 100644 --- a/test/cmake/usbx/CMakeLists.txt +++ b/test/cmake/usbx/CMakeLists.txt @@ -304,8 +304,7 @@ target_compile_options( -Wshadow -Wlogical-op -Waggregate-return - -Wfloat-equal - -DFX_ENABLE_EXFAT) + -Wfloat-equal) # Remove includes and files not needed from usbx build set(UX_STANDALONE_HOST_EXCLUDES diff --git a/test/cmake/usbx/regression/CMakeLists.txt b/test/cmake/usbx/regression/CMakeLists.txt index fe3cb6f8..00e58cfc 100644 --- a/test/cmake/usbx/regression/CMakeLists.txt +++ b/test/cmake/usbx/regression/CMakeLists.txt @@ -374,7 +374,6 @@ set(ux_class_storage_test_cases ${SOURCE_DIR}/usbx_ux_host_class_storage_driver_entry_test.c ${SOURCE_DIR}/usbx_ux_host_class_storage_entry_test.c ${SOURCE_DIR}/usbx_ux_host_class_storage_thread_entry_test.c - ${SOURCE_DIR}/usbx_ux_host_class_storage_fats_exfat_test.c ${SOURCE_DIR}/usbx_uxe_device_storage_test.c ${SOURCE_DIR}/usbx_uxe_host_storage_test.c ) @@ -643,7 +642,7 @@ set(test_utility_files ${SOURCE_DIR}/usbx_ux_host_class_storage_fx_driver.c) add_library(test_utility ${test_utility_files}) target_link_libraries(test_utility PUBLIC azrtos::usbx azrtos::threadx azrtos::netxduo azrtos::filex) -target_compile_definitions(test_utility PUBLIC CTEST FX_ENABLE_EXFAT) +target_compile_definitions(test_utility PUBLIC CTEST) if (CMAKE_BUILD_TYPE MATCHES "msrc_rtos_build") set(test_cases