Merge branch 'rs/help-c-source-with-gitattributes' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9f36091bf81889fe4b6f54ad36796dde29633335..d731d66e3673f0e9d990007dd690c14d84eae783 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -801,7 +801,7 @@ then
        # override all git executables in TEST_DIRECTORY/..
        GIT_VALGRIND=$TEST_DIRECTORY/valgrind
        mkdir -p "$GIT_VALGRIND"/bin
-       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
+       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
        do
                make_valgrind_symlink $file
        done
@@ -1114,3 +1114,12 @@ run_with_limited_cmdline () {
 }
 
 test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+
+build_option () {
+       git version --build-options |
+       sed -ne "s/^$1: //p"
+}
+
+test_lazy_prereq LONG_IS_64BIT '
+       test 8 -le "$(build_option sizeof-long)"
+'