Skip to content

Commit

Permalink
Merge pull request #135 from eclipse-threadx/tizho/update_script
Browse files Browse the repository at this point in the history
Update links in run.sh script
  • Loading branch information
wickste committed Jan 12, 2024
2 parents 5659373 + 179e906 commit bec2ce9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
3 changes: 1 addition & 2 deletions test/cmake/usbx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions test/cmake/usbx/regression/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/cmake/usbx/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bec2ce9

Please sign in to comment.