mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-28 12:45:13 +00:00
Correct test environment setup
XDG_RUNTIME_DIR was misspelled. XDG_DATA_DIRS could affect tests. Remove it since it's used read-only.
This commit is contained in:
parent
f4bcfd9085
commit
2fff12104d
1 changed files with 9 additions and 6 deletions
|
@ -83,9 +83,10 @@ add_custom_target(test_prep
|
||||||
# So define both a normal target, and a serial variant which enforces ordering.
|
# So define both a normal target, and a serial variant which enforces ordering.
|
||||||
foreach(TESTTYPE test serial_test)
|
foreach(TESTTYPE test serial_test)
|
||||||
add_custom_target(${TESTTYPE}_low_level
|
add_custom_target(${TESTTYPE}_low_level
|
||||||
COMMAND env XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
COMMAND env -u XDG_DATA_DIRS
|
||||||
|
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
||||||
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
||||||
XDG_RUNTIME_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
||||||
./fish_tests
|
./fish_tests
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
DEPENDS fish_tests
|
DEPENDS fish_tests
|
||||||
|
@ -94,18 +95,20 @@ foreach(TESTTYPE test serial_test)
|
||||||
add_custom_target(${TESTTYPE}_fishscript
|
add_custom_target(${TESTTYPE}_fishscript
|
||||||
COMMAND
|
COMMAND
|
||||||
cd tests &&
|
cd tests &&
|
||||||
env XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
env -u XDG_DATA_DIRS
|
||||||
|
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
||||||
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
||||||
XDG_RUNTIME_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
||||||
${TEST_ROOT_DIR}/bin/fish test.fish
|
${TEST_ROOT_DIR}/bin/fish test.fish
|
||||||
DEPENDS test_prep
|
DEPENDS test_prep
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
|
|
||||||
add_custom_target(${TESTTYPE}_interactive
|
add_custom_target(${TESTTYPE}_interactive
|
||||||
COMMAND cd tests &&
|
COMMAND cd tests &&
|
||||||
env XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
env -u XDG_DATA_DIRS
|
||||||
|
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data
|
||||||
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
XDG_CONFIG_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_config
|
||||||
XDG_RUNTIME_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
|
||||||
${TEST_ROOT_DIR}/bin/fish interactive.fish
|
${TEST_ROOT_DIR}/bin/fish interactive.fish
|
||||||
DEPENDS test_prep
|
DEPENDS test_prep
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
|
|
Loading…
Reference in a new issue