summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wick <[email protected]>2024-01-12 14:04:29 -0800
committerGitHub <[email protected]>2024-01-12 14:04:29 -0800
commitbec2ce97956fae6351fcfea6b524214c41103809 (patch)
treeaf6ad1f46979733fdde646114d4aae7d59e320ae
parent565937337ea9293c89b34464559ece37153b8633 (diff)
parent179e906ee2dab975a4e7a45804f17ec7036a7bda (diff)
Merge pull request #135 from eclipse-threadx/tizho/update_script
Update links in run.sh script
-rw-r--r--test/cmake/usbx/CMakeLists.txt3
-rw-r--r--test/cmake/usbx/regression/CMakeLists.txt3
-rwxr-xr-xtest/cmake/usbx/run.sh8
3 files changed, 6 insertions, 8 deletions
diff --git a/test/cmake/usbx/CMakeLists.txt b/test/cmake/usbx/CMakeLists.txt
index dc9f512..fb2f69f 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 fe3cb6f..00e58cf 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
diff --git a/test/cmake/usbx/run.sh b/test/cmake/usbx/run.sh
index c9a81ca..040343f 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