This patch makes --valgrind try to override _all_ Git binaries in the PATH, and it will make calling *.sh and *.perl scripts directly an error. While it is not strictly necessary to look through the whole PATH to find git binaries to override, it is in line with running an expensive test (which valgrind is) to make extra sure that no binary is tested that actually comes from the git.git checkout. In the same spirit, we can test that neither our test suite nor our scripts try to run the *.sh or *.perl scripts directly. It's more like a "because we can" than a "this is tightly connected to valgrind", but in the author's opinion "because we can" is "so we should" in this case. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- As I said, I vividly remember chasing a bug which turned out to be a Git program that was installed, but no longer in git.git, yet the test suite used it. This would catch it. t/test-lib.sh | 42 +++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 67d7883..bdfb30f 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -496,23 +496,35 @@ else # override all git executables in TEST_DIRECTORY/.. GIT_VALGRIND=$TEST_DIRECTORY/valgrind mkdir -p "$GIT_VALGRIND"/bin - ls $TEST_DIRECTORY/../git* 2> /dev/null | - while read symlink_target + OLDIFS=$IFS + IFS=: + for path in $PATH $TEST_DIRECTORY/.. do - # handle only executables - test -x "$symlink_target" || continue - - base=$(basename "$symlink_target") - # do not override scripts - if test ! -d "$symlink_target" && - test "#!" != "$(head -c 2 < "$symlink_target")" - then - symlink_target=../valgrind.sh - fi - # create the link, or replace it if it is out of date - make_symlink "$symlink_target" \ - "$GIT_VALGRIND/bin/$base" || exit + ls "$path"/git "$path"/git-* 2> /dev/null | + while read file + do + # handle only executables + test -x "$file" || continue + + base=$(basename "$file") + symlink_target=$TEST_DIRECTORY/../$base + # do not override scripts + if test -x "$symlink_target" && + test ! -d "$symlink_target" && + test "#!" != "$(head -c 2 < "$symlink_target")" + then + symlink_target=../valgrind.sh + fi + case "$base" in + *.sh|*.perl) + symlink_target=../unprocessed-script + esac + # create the link, or replace it if it is out of date + make_symlink "$symlink_target" \ + "$GIT_VALGRIND/bin/$base" || exit + done done + IFS=$OLDIFS PATH=$GIT_VALGRIND/bin:$PATH GIT_EXEC_PATH=$GIT_VALGRIND/bin export GIT_VALGRIND -- 1.6.1.482.g7d54be -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
