github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 18:03:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Tests: Set $XDG_DATA_DIRS to empty instead of unsetting

Browse Source 
NetBSD's `env` doesn't have `-u` and this should be harmless.
This commit is contained in:
Fabian Homborg 2021-05-18 12:24:24 +02:00
parent 63dd046f99
commit a09125897e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Tests.cmake
View File

@ -83,7 +83,7 @@ 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 -u XDG_DATA_DIRS COMMAND env XDG_DATA_DIRS=
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data 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_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
@ -95,7 +95,7 @@ foreach(TESTTYPE test serial_test)
add_custom_target(${TESTTYPE}_fishscript add_custom_target(${TESTTYPE}_fishscript
COMMAND COMMAND
cd tests && cd tests &&
env -u XDG_DATA_DIRS env XDG_DATA_DIRS=
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data 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_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime
@ -105,7 +105,7 @@ foreach(TESTTYPE test serial_test)
add_custom_target(${TESTTYPE}_interactive add_custom_target(${TESTTYPE}_interactive
COMMAND cd tests && COMMAND cd tests &&
env -u XDG_DATA_DIRS env XDG_DATA_DIRS=
XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_data 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_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime XDG_RUNTIME_DIR=${CMAKE_CURRENT_BINARY_DIR}/test/xdg_runtime