fix build when path has spaces in it.

Now it works.
This commit is contained in:
Aaron Gyes
2021-10-22 02:27:19 -07:00
parent f4377e1a26
commit 901dbd71b0
3 changed files with 9 additions and 10 deletions

View File

@@ -46,7 +46,7 @@ ln -s "$PWD/test_functions" "$XDG_CONFIG_HOME/fish/functions" || die "Failed to
# Set the function path at startup, referencing the default fish functions and the test-specific
# functions.
fish_init_cmd="set fish_function_path ${XDG_CONFIG_HOME}/fish/functions ${BUILD_ROOT}/share/functions"
fish_init_cmd="set fish_function_path '${XDG_CONFIG_HOME}/fish/functions' '${BUILD_ROOT}/share/functions'"
__fish_is_running_tests="$homedir"
export __fish_is_running_tests
@@ -64,9 +64,8 @@ fish_init_cmd="${fish_init_cmd} && source ${TESTS_ROOT}/test_util.fish";
# Run the test script, but don't exec so we can clean up after it succeeds/fails. Each test is
# launched directly within its TMPDIR, so that the fish tests themselves do not need to refer to
# TMPDIR (to ensure their output as displayed in case of failure by littlecheck is reproducible).
(cd $TMPDIR; env HOME="$homedir" "${BUILD_ROOT}/test/root/bin/fish" \
--init-command "${fish_init_cmd}" \
"$fish_script" "$script_args")
(cd $TMPDIR && env HOME="$homedir" "${BUILD_ROOT}/test/root/bin/fish" \
--init-command "${fish_init_cmd}" "$fish_script" "$script_args")
test_status="$?"
# CMake less than 3.9.0 "fully supports" setting an exit code to denote a skipped test, but then