mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-17 08:01:14 -03:00
c5e4fed021
Change some files which have lines whose indentation is not a multiple of the 4 spaces specified in the editorconfig file. Some of these changes are fixes or clear improvements (e.g. in Rust macros which rustfmt can't format properly). Other changes don't clearly improve the code style, and in some cases it might actually get worse. The goal is to eventually be able to use our editorconfig for automated style checks, but there are a lot of cases where conforming to the limited editorconfig style spec does not make sense, so I'm not sure how useful such automated checks can be. Closes #12408
77 lines
2.5 KiB
CMake
77 lines
2.5 KiB
CMake
FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish)
|
|
foreach(CHECK ${FISH_CHECKS})
|
|
get_filename_component(CHECK_NAME ${CHECK} NAME)
|
|
add_custom_target(
|
|
test_${CHECK_NAME}
|
|
COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
|
|
checks/${CHECK_NAME}
|
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
|
|
DEPENDS fish fish_indent fish_key_reader
|
|
USES_TERMINAL
|
|
)
|
|
endforeach(CHECK)
|
|
|
|
FILE(GLOB PEXPECTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/pexpects/*.py)
|
|
foreach(PEXPECT ${PEXPECTS})
|
|
get_filename_component(PEXPECT ${PEXPECT} NAME)
|
|
add_custom_target(
|
|
test_${PEXPECT}
|
|
COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
|
|
pexpects/${PEXPECT}
|
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
|
|
DEPENDS fish fish_indent fish_key_reader
|
|
USES_TERMINAL
|
|
)
|
|
endforeach(PEXPECT)
|
|
|
|
# Rust stuff.
|
|
set(cargo_test_flags)
|
|
if(DEFINED ASAN)
|
|
# Rust w/ -Zsanitizer=address requires explicitly specifying the --target triple or else linker
|
|
# errors pertaining to asan symbols will ensue.
|
|
if(NOT DEFINED Rust_CARGO_TARGET)
|
|
message(
|
|
FATAL_ERROR
|
|
"ASAN requires defining the CMake variable Rust_CARGO_TARGET to the
|
|
intended target triple"
|
|
)
|
|
endif()
|
|
endif()
|
|
if(DEFINED TSAN)
|
|
if(NOT DEFINED Rust_CARGO_TARGET)
|
|
message(
|
|
FATAL_ERROR
|
|
"TSAN requires defining the CMake variable Rust_CARGO_TARGET to the
|
|
intended target triple"
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
if(DEFINED Rust_CARGO_TARGET)
|
|
list(APPEND cargo_test_flags "--target" ${Rust_CARGO_TARGET})
|
|
list(APPEND cargo_test_flags "--lib")
|
|
endif()
|
|
|
|
set(max_concurrency_flag)
|
|
if(DEFINED ENV{FISH_TEST_MAX_CONCURRENCY})
|
|
list(APPEND max_concurrency_flag "--max-concurrency" $ENV{FISH_TEST_MAX_CONCURRENCY})
|
|
endif()
|
|
|
|
# The top-level test target is "fish_run_tests".
|
|
add_custom_target(fish_run_tests
|
|
# TODO: This should be replaced with a unified solution, possibly build_tools/check.sh.
|
|
COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${max_concurrency_flag} ${CMAKE_CURRENT_BINARY_DIR}
|
|
COMMAND
|
|
env ${VARS_FOR_CARGO} ${Rust_CARGO}
|
|
test
|
|
--no-default-features
|
|
--features=${FISH_CARGO_FEATURES}
|
|
${CARGO_FLAGS}
|
|
--workspace
|
|
--target-dir ${rust_target_dir}
|
|
${cargo_test_flags}
|
|
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
|
DEPENDS fish fish_indent fish_key_reader
|
|
USES_TERMINAL
|
|
)
|