undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/test-quoting-fix'

Browse Source 
Fixes for tests when the source directory has unusual characters in
its path, e.g. whitespaces, double-quotes, etc.

* ab/test-quoting-fix:
  config tests: fix harmless but broken "rm -r" cleanup
  test-lib.sh: fix prepend_var() quoting issue
  tests: add missing double quotes to included library paths
This commit is contained in:
Junio C Hamano 2022-07-13 14:54:52 -07:00
commit 92a25a8897
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t1300-config.sh
View File

@ -2083,12 +2083,13 @@ test_expect_success '--show-scope with --show-origin' '
' '
test_expect_success 'override global and system config' ' test_expect_success 'override global and system config' '
test_when_finished rm -f "$HOME"/.config/git && test_when_finished rm -f \"\$HOME\"/.gitconfig &&
cat >"$HOME"/.gitconfig <<-EOF && cat >"$HOME"/.gitconfig <<-EOF &&
[home] [home]
config = true config = true
EOF EOF
test_when_finished rm -rf \"\$HOME\"/.config/git &&
mkdir -p "$HOME"/.config/git && mkdir -p "$HOME"/.config/git &&
cat >"$HOME"/.config/git/config <<-EOF && cat >"$HOME"/.config/git/config <<-EOF &&
[xdg] [xdg]

2
t/t3700-add.sh
View File

@ -8,7 +8,7 @@ test_description='Test of git add, including the -- option.'
TEST_PASSES_SANITIZE_LEAK=true TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
. $TEST_DIRECTORY/lib-unique-files.sh . "$TEST_DIRECTORY"/lib-unique-files.sh
# Test the file mode "$1" of the file "$2" in the index. # Test the file mode "$1" of the file "$2" in the index.
test_mode_in_index () { test_mode_in_index () {

2
t/t3903-stash.sh
View File

@ -9,7 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
. $TEST_DIRECTORY/lib-unique-files.sh . "$TEST_DIRECTORY"/lib-unique-files.sh
test_expect_success 'usage on cmd and subcommand invalid option' ' test_expect_success 'usage on cmd and subcommand invalid option' '
test_expect_code 129 git stash --invalid-option 2>usage && test_expect_code 129 git stash --invalid-option 2>usage &&

2
t/t7609-mergetool--lib.sh
View File

@ -7,7 +7,7 @@ Testing basic merge tools options'
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'mergetool --tool=vimdiff creates the expected layout' ' test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
. $GIT_BUILD_DIR/mergetools/vimdiff && . "$GIT_BUILD_DIR"/mergetools/vimdiff &&
run_unit_tests run_unit_tests
' '

4
t/test-lib.sh
View File

@ -57,14 +57,14 @@ fi
# #
# prepend_var VAR : VALUE # prepend_var VAR : VALUE
prepend_var () { prepend_var () {
eval "$1=$3\${$1:+${3:+$2}\$$1}" eval "$1=\"$3\${$1:+${3:+$2}\$$1}\""
} }
# If [AL]SAN is in effect we want to abort so that we notice # If [AL]SAN is in effect we want to abort so that we notice
# problems. The GIT_SAN_OPTIONS variable can be used to set common # problems. The GIT_SAN_OPTIONS variable can be used to set common
# defaults shared between [AL]SAN_OPTIONS. # defaults shared between [AL]SAN_OPTIONS.
prepend_var GIT_SAN_OPTIONS : abort_on_error=1 prepend_var GIT_SAN_OPTIONS : abort_on_error=1
prepend_var GIT_SAN_OPTIONS : strip_path_prefix=\"$GIT_BUILD_DIR/\" prepend_var GIT_SAN_OPTIONS : strip_path_prefix="$GIT_BUILD_DIR/"
# If we were built with ASAN, it may complain about leaks # If we were built with ASAN, it may complain about leaks
# of program-lifetime variables. Disable it by default to lower # of program-lifetime variables. Disable it by default to lower