Skip to content

Remove armv4t/armv5t from check-all targets #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Remove armv4t/armv5t from check-all targets #540

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e51f55
Remove armv4t/armv5t from check-all targets
dcandler Oct 23, 2024
f21ba87
fixup! Remove armv4t/armv5t from check-all targets
dcandler Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,11 @@ function(add_compiler_rt_tests variant)
)
add_custom_target(check-compiler-rt-${variant})
add_dependencies(check-compiler-rt-${variant} compiler_rt_${variant}-check-compiler-rt)
add_dependencies(check-compiler-rt check-compiler-rt-${variant})
# Do not add armv4 or armv5 tests to the check-all
# targets as they currently hang.
if(NOT VARIANT_COMPILE_FLAGS MATCHES "-march=armv4|5")
add_dependencies(check-compiler-rt check-compiler-rt-${variant})
endif()
add_dependencies(check-llvm-toolchain-runtimes-${variant} check-compiler-rt-${variant})
endfunction()

Expand All @@ -1334,7 +1338,11 @@ function(add_libcxx_libcxxabi_libunwind_tests variant)
)
add_custom_target(${check_target}-${variant_with_extensions})
add_dependencies(${check_target}-${variant_with_extensions} ${target_name}-${check_target})
add_dependencies(${check_target} ${target_name}-${check_target})
# Do not add armv4 or armv5 tests to the check-all
# targets as they currently hang.
if(NOT variant MATCHES "-march=armv4|5")
add_dependencies(${check_target} ${target_name}-${check_target})
endif()
add_dependencies(check-llvm-toolchain-runtimes-${variant} ${check_target}-${variant_with_extensions})
endforeach()
endfunction()
Expand Down Expand Up @@ -1499,7 +1507,11 @@ function(add_library_variant target_arch)
message("C++ runtime libraries tests disabled for ${variant}")
else()
add_custom_target(check-llvm-toolchain-runtimes-${variant})
add_dependencies(check-llvm-toolchain-runtimes check-llvm-toolchain-runtimes-${variant})
# Do not add armv4 or armv5 tests to the check-all
# targets as they currently hang.
if(NOT VARIANT_COMPILE_FLAGS MATCHES "-march=armv4|5")
add_dependencies(check-llvm-toolchain-runtimes check-llvm-toolchain-runtimes-${variant})
endif()
add_compiler_rt_tests("${variant}")
if(CXX_LIBS)
add_libcxx_libcxxabi_libunwind_tests("${variant}")
Expand Down
Loading