{"thread":{"id":"55129","subject":"[PATCH 00/12] test-lib: misc improvements","startedAt":"2021-02-09T22:28:46Z","lastAt":"2021-02-13T14:39:52Z","messageCount":38,"participants":["Ævar Arnfjörð Bjarmason","Denton Liu","Junio C Hamano","SZEDER Gábor","Jeff King","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":12},"messages":[{"id":"416568","messageId":"20210209214159.22815-1-avarab@gmail.com","threadId":"55129","inReplyTo":null,"subject":"[PATCH 00/12] test-lib: misc improvements","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-09T21:41:47Z","receivedAt":"2021-02-09T22:28:46Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Various miscellaneous small and easy to review cleanups & fixes to the\ntest libraries. This doesn't conflict with the current \"seen\" branch.\n\nÆvar Arnfjörð Bjarmason (12):\n test-lib: remove check_var_migration\n test lib: change \"error\" to \"BUG\" as appropriate\n test-lib-functions: move test_set_index_version() to its user\n test-lib-functions: remove generate_zero_bytes() wrapper\n test libs: rename bundle helper to \"lib-bundle.sh\"\n test libs: rename gitweb-lib.sh to lib-gitweb.sh\n test-lib-functions: move function to lib-bitmap.sh\n t/.gitattributes: sort lines\n test libs: rename \"diff-lib\" to \"lib-diff\"\n test-lib-functions: remove bug-inducing \"diagnostics\" helper param\n test-lib-functions: assert correct parameter count\n test-lib-functions: split out {debug,path,text} helpers\n\n t/.gitattributes | 4 +-\n t/README | 8 +-\n t/lib-bitmap.sh | 26 ++\n t/{test-bundle-functions.sh => lib-bundle.sh} | 0\n t/{diff-lib.sh => lib-diff.sh} | 0\n t/{diff-lib => lib-diff}/COPYING | 0\n t/{diff-lib => lib-diff}/README | 0\n t/{gitweb-lib.sh => lib-gitweb.sh} | 0\n t/t2104-update-index-skip-worktree.sh | 5 +\n t/t3404-rebase-interactive.sh | 3 +-\n t/t4000-diff-format.sh | 2 +-\n t/t4001-diff-rename.sh | 2 +-\n t/t4003-diff-rename-1.sh | 6 +-\n t/t4004-diff-rename-symlink.sh | 2 +-\n t/t4005-diff-rename-2.sh | 6 +-\n t/t4007-rename-3.sh | 6 +-\n t/t4008-diff-break-rewrite.sh | 6 +-\n t/t4009-diff-rename-4.sh | 6 +-\n t/t4010-diff-pathspec.sh | 2 +-\n t/t4011-diff-symlink.sh | 2 +-\n t/t4013-diff-various.sh | 2 +-\n t/t4015-diff-whitespace.sh | 2 +-\n t/t4027-diff-submodule.sh | 2 +-\n t/t4034-diff-words.sh | 2 +-\n t/t4038-diff-combined.sh | 2 +-\n t/t4061-diff-indent.sh | 2 +-\n t/t4206-log-follow-harder-copies.sh | 2 +-\n t/t5310-pack-bitmaps.sh | 2 +\n t/t5318-commit-graph.sh | 2 +-\n t/t5510-fetch.sh | 2 +-\n t/t6020-bundle-misc.sh | 2 +-\n t/t6113-rev-list-bitmap-filters.sh | 1 +\n t/t6426-merge-skip-unneeded-updates.sh | 16 +-\n t/t6500-gc.sh | 4 +-\n t/t7501-commit-basic-functionality.sh | 2 +-\n t/t9300-fast-import.sh | 2 +-\n t/t9500-gitweb-standalone-no-errors.sh | 2 +-\n t/t9501-gitweb-standalone-http-status.sh | 2 +-\n t/t9502-gitweb-standalone-parse-output.sh | 2 +-\n t/test-lib-functions.sh | 305 +-----------------\n t/test-lib-functions/debug.sh | 99 ++++++\n t/test-lib-functions/path.sh | 137 ++++++++\n t/test-lib-functions/text.sh | 33 ++\n t/test-lib.sh | 30 --\n 44 files changed, 370 insertions(+), 373 deletions(-)\n create mode 100644 t/lib-bitmap.sh\n rename t/{test-bundle-functions.sh => lib-bundle.sh} (100%)\n rename t/{diff-lib.sh => lib-diff.sh} (100%)\n rename t/{diff-lib => lib-diff}/COPYING (100%)\n rename t/{diff-lib => lib-diff}/README (100%)\n rename t/{gitweb-lib.sh => lib-gitweb.sh} (100%)\n create mode 100644 t/test-lib-functions/debug.sh\n create mode 100644 t/test-lib-functions/path.sh\n create mode 100644 t/test-lib-functions/text.sh\n\n-- \n2.30.0.284.gd98b1dd5eaa7\n\n"},{"id":"416569","messageId":"20210209214159.22815-2-avarab@gmail.com","threadId":"55129","inReplyTo":"20210209214159.22815-1-avarab@gmail.com","subject":"[PATCH 01/12] test-lib: remove check_var_migration","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-09T21:41:48Z","receivedAt":"2021-02-09T22:28:53Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Remove the check_var_migration() migration helper. This was added back\nin [1], [2] and [3] to warn users to migrate from e.g. the\n\"GIT_FSMONITOR_TEST\" name to \"GIT_TEST_FSMONITOR\".\n\nI daresay that having been warning about this since late 2018 (or\nv2.20.0) was sufficient time to give everyone interested a heads-up\nabout moving to the new names.\n\nI don't see the need for going through the \"do this later\" codepath\nanticipated in [1], let's just remove this instead.\n\n1. 4cb54d0aa8e (fsmonitor: update GIT_TEST_FSMONITOR support,\n 2018-09-18)\n2. 1f357b045b5 (read-cache: update TEST_GIT_INDEX_VERSION support,\n 2018-09-18)\n3. 5765d97b71d (preload-index: update GIT_FORCE_PRELOAD_TEST support,\n 2018-09-18)\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n t/test-lib.sh | 30 ------------------------------\n 1 file changed, 30 deletions(-)\n\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 76062db2964..61bda88245c 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -462,36 +462,6 @@ export GIT_DEFAULT_HASH\n GIT_TRACE_BARE=1\n export GIT_TRACE_BARE\n \n-check_var_migration () {\n-\t# the warnings and hints given from this helper depends\n-\t# on end-user settings, which will disrupt the self-test\n-\t# done on the test framework itself.\n-\tcase \"$GIT_TEST_FRAMEWORK_SELFTEST\" in\n-\tt)\treturn ;;\n-\tesac\n-\n-\told_name=$1 new_name=$2\n-\teval \"old_isset=\\${${old_name}:+isset}\"\n-\teval \"new_isset=\\${${new_name}:+isset}\"\n-\n-\tcase \"$old_isset,$new_isset\" in\n-\tisset,)\n-\t\techo >&2 \"warning: $old_name is now $new_name\"\n-\t\techo >&2 \"hint: set $new_name too during the transition period\"\n-\t\teval \"$new_name=\\$$old_name\"\n-\t\t;;\n-\tisset,isset)\n-\t\t# do this later\n-\t\t# echo >&2 \"warning: $old_name is now $new_name\"\n-\t\t# echo >&2 \"hint: remove $old_name\"\n-\t\t;;\n-\tesac\n-}\n-\n-check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR\n-check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION\n-check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX\n-\n # Use specific version of the index file format\n if test -n \"${GIT_TEST_INDEX_VERSION:+isset}\"\n then\n-- \n2.30.0.284.gd98b1dd5eaa7\n\n"},{"id":"416570","messageId":"20210209214159.22815-3-avarab@gmail.com","threadId":"55129","inReplyTo":"20210209214159.22815-1-avarab@gmail.com","subject":"[PATCH 02/12] test lib: change \"error\" to \"BUG\" as appropriate","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-09T21:41:49Z","receivedAt":"2021-02-09T22:29:41Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change two uses of \"error\" in test-lib-functions.sh to \"BUG\".\n\nIn the first instance in \"test_cmp_rev\" the author of the \"BUG\"\nfunction added in [1] had another in-flight patch adding this in [2],\nand the two were never consolidated.\n\nIn the second case in \"test_atexit\" added in [3] that we could have\ninstead used \"BUG\" appears to have been missed.\n\n1. 165293af3ce (tests: send \"bug in the test script\" errors to the\n script's stderr, 2018-11-19)\n\n2. 30d0b6dccbc (test-lib-functions: make 'test_cmp_rev' more\n informative on failure, 2018-11-19)\n\n3. 900721e15c4 (test-lib: introduce 'test_atexit', 2019-03-13)\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n t/test-lib-functions.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex 6bca0023168..0d40f8a598e 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -1105,7 +1105,7 @@ test_cmp_rev () {\n \tfi\n \tif test $# != 2\n \tthen\n-\t\terror \"bug in the test script: test_cmp_rev requires two revisions, but got $#\"\n+\t\tBUG \"test_cmp_rev requires two revisions, but got $#\"\n \telse\n \t\tlocal r1 r2\n \t\tr1=$(git rev-parse --verify \"$1\") &&\n@@ -1216,7 +1216,7 @@ test_atexit () {\n \t# doing so on Bash is better than nothing (the test will\n \t# silently pass on other shells).\n \ttest \"${BASH_SUBSHELL-0}\" = 0 ||\n-\terror \"bug in test script: test_atexit does nothing in a subshell\"\n+\tBUG \"test_atexit does nothing in a subshell\"\n \ttest_atexit_cleanup=\"{ $*\n \t\t} && (exit \\\"\\$eval_ret\\\"); eval_ret=\\$?; $test_atexit_cleanup\"\n }\n-- \n2.30.0.284.gd98b1dd5eaa7\n\n"},{"id":"416574","messageId":"20210209214159.22815-4-avarab@gmail.com","threadId":"55129","inReplyTo":"20210209214159.22815-1-avarab@gmail.com","subject":"[PATCH 03/12] test-lib-functions: move test_set_index_version() to its user","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-09T21:41:50Z","receivedAt":"2021-02-09T22:59:13Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Move the test_set_index_version() function to its only user. This\nfunction has only been used in one place since its addition in\n5d9fc888b48 (test-lib: allow setting the index format version,\n2014-02-23). Let's have that test script define it.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n t/t2104-update-index-skip-worktree.sh | 5 +++++\n t/test-lib-functions.sh | 5 -----\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh\nindex 7e2e7dd4ae5..30666fc70d2 100755\n--- a/t/t2104-update-index-skip-worktree.sh\n+++ b/t/t2104-update-index-skip-worktree.sh\n@@ -9,6 +9,11 @@ test_description='skip-worktree bit test'\n \n sane_unset GIT_TEST_SPLIT_INDEX\n \n+test_set_index_version () {\n+ GIT_INDEX_VERSION=\"$1\"\n+ export GIT_INDEX_VERSION\n+}\n+\n test_set_index_version 3\n \n cat >expect.full <\n---\n t/t5318-commit-graph.sh | 2 +-\n t/test-lib-functions.sh | 7 -------\n 2 files changed, 1 insertion(+), 8 deletions(-)\n\ndiff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh\nindex 2ed0c1544da..368d1cfb448 100755\n--- a/t/t5318-commit-graph.sh\n+++ b/t/t5318-commit-graph.sh\n@@ -529,7 +529,7 @@ corrupt_graph_and_verify() {\n \tzero_pos=${4:-${orig_size}} &&\n \tprintf \"$data\" | dd of=\"$objdir/info/commit-graph\" bs=1 seek=\"$pos\" conv=notrunc &&\n \tdd of=\"$objdir/info/commit-graph\" bs=1 seek=\"$zero_pos\" if=/dev/null &&\n-\tgenerate_zero_bytes $(($orig_size - $zero_pos)) >>\"$objdir/info/commit-graph\" &&\n+\ttest-tool genzeros $(($orig_size - $zero_pos)) >>\"$objdir/info/commit-graph\" &&\n \tcorrupt_graph_verify \"$grepstr\"\n \n }\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex 728bdf94684..55d58b4a6ac 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -111,13 +111,6 @@ remove_cr () {\n \ttr '\\015' Q | sed -e 's/Q$//'\n }\n \n-# Generate an output of $1 bytes of all zeroes (NULs, not ASCII zeroes).\n-# If $1 is 'infinity', output forever or until the receiving pipe stops reading,\n-# whichever comes first.\n-generate_zero_bytes () {\n-\ttest-tool genzeros \"$@\"\n-}\n-\n # In some bourne shell implementations, the \"unset\" builtin returns\n # nonzero status when a variable to be unset was not set in the first\n # place.\n-- \n2.30.0.284.gd98b1dd5eaa7\n\n"},{"id":"416577","messageId":"20210209214159.22815-13-avarab@gmail.com","threadId":"55129","inReplyTo":"20210209214159.22815-1-avarab@gmail.com","subject":"[PATCH 12/12] test-lib-functions: split out {debug,path,text} helpers","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-02-09T21:41:59Z","receivedAt":"2021-02-09T23:02:07Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Split out the debug, path and text miscellaneous helpers into their\nown files. The \"test -[efsd]\" etc. helpers were not all in one place\nin test-lib-functions.sh, I think moving them into their own file\nmakes it easier to follow the code.\n\nThe same goes for the miscellaneous text munging helpers, and the\ndebug code that was early in the file.\n\nAs viewing this commit with diff.colorMoved=true will show there's no\nfunctional changes here. The only added/removed lines are comments and\nwhitespace. The rest is all moving of existing code into new files.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n t/test-lib-functions.sh | 267 +---------------------------------\n t/test-lib-functions/debug.sh | 99 +++++++++++++\n t/test-lib-functions/path.sh | 137 +++++++++++++++++\n t/test-lib-functions/text.sh | 33 +++++\n 4 files changed, 275 insertions(+), 261 deletions(-)\n create mode 100644 t/test-lib-functions/debug.sh\n create mode 100644 t/test-lib-functions/path.sh\n create mode 100644 t/test-lib-functions/text.sh\n\ndiff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh\nindex 8ec06eb67a0..a21ba83d83c 100644\n--- a/t/test-lib-functions.sh\n+++ b/t/test-lib-functions.sh\n@@ -16,6 +16,12 @@\n # You should have received a copy of the GNU General Public License\n # along with this program. If not, see http://www.gnu.org/licenses/ .\n \n+# Include sub-libraries of test-lib-functions.sh, split out for\n+# readability.\n+. \"$TEST_DIRECTORY/test-lib-functions/debug.sh\"\n+. \"$TEST_DIRECTORY/test-lib-functions/path.sh\"\n+. \"$TEST_DIRECTORY/test-lib-functions/text.sh\"\n+\n # The semantics of the editor variables are that of invoking\n # sh -c \"$EDITOR \\\"$@\\\"\" files ...\n #\n@@ -79,37 +85,7 @@ test_decode_color () {\n \t'\n }\n \n-lf_to_nul () {\n-\tperl -pe 'y/\\012/\\000/'\n-}\n-\n-nul_to_q () {\n-\tperl -pe 'y/\\000/Q/'\n-}\n-\n-q_to_nul () {\n-\tperl -pe 'y/Q/\\000/'\n-}\n-\n-q_to_cr () {\n-\ttr Q '\\015'\n-}\n-\n-q_to_tab () {\n-\ttr Q '\\011'\n-}\n-\n-qz_to_tab_space () {\n-\ttr QZ '\\011\\040'\n-}\n-\n-append_cr () {\n-\tsed -e 's/$/Q/' | tr Q '\\015'\n-}\n \n-remove_cr () {\n-\ttr '\\015' Q | sed -e 's/Q$//'\n-}\n \n # In some bourne shell implementations, the \"unset\" builtin returns\n # nonzero status when a variable to be unset was not set in the first\n@@ -134,38 +110,6 @@ test_tick () {\n \texport GIT_COMMITTER_DATE GIT_AUTHOR_DATE\n }\n \n-# Stop execution and start a shell. This is useful for debugging tests.\n-#\n-# Be sure to remove all invocations of this command before submitting.\n-\n-test_pause () {\n-\t\"$SHELL_PATH\" <&6 >&5 2>&7\n-}\n-\n-# Wrap git with a debugger. Adding this to a command can make it easier\n-# to understand what is going on in a failing test.\n-#\n-# Examples:\n-# debug git checkout master\n-# debug --debugger=nemiver git $ARGS\n-# debug -d \"valgrind --tool=memcheck --track-origins=yes\" git $ARGS\n-debug () {\n-\tcase \"$1\" in\n-\t-d)\n-\t\tGIT_DEBUGGER=\"$2\" &&\n-\t\tshift 2\n-\t\t;;\n-\t--debugger=*)\n-\t\tGIT_DEBUGGER=\"${1#*=}\" &&\n-\t\tshift 1\n-\t\t;;\n-\t*)\n-\t\tGIT_DEBUGGER=1\n-\t\t;;\n-\tesac &&\n-\tGIT_DEBUGGER=\"${GIT_DEBUGGER}\" \"$@\" <&6 >&5 2>&7\n-}\n-\n # Usage: test_commit [options] [ [ []]]\n # -C :\n #\tRun all git commands in directory \n@@ -369,25 +313,6 @@ test_commit_bulk () {\n \n }\n \n-# This function helps systems where core.filemode=false is set.\n-# Use it instead of plain 'chmod +x' to set or unset the executable bit\n-# of a file in the working directory and add it to the index.\n-\n-test_chmod () {\n-\tchmod \"$@\" &&\n-\tgit update-index --add \"--chmod=$@\"\n-}\n-\n-# Get the modebits from a file or directory, ignoring the setgid bit (g+s).\n-# This bit is inherited by subdirectories at their creation. So we remove it\n-# from the returning string to prevent callers from having to worry about the\n-# state of the bit in the test directory.\n-#\n-test_modebits () {\n-\tls -ld \"$1\" | sed -e 's|^\\(..........\\).*|\\1|' \\\n-\t\t\t -e 's|^\\(......\\)S|\\1-|' -e 's|^\\(......\\)s|\\1x|'\n-}\n-\n # Unset a configuration variable, but don't fail if it doesn't exist.\n test_unconfig () {\n \tconfig_dir=\n@@ -716,99 +641,6 @@ test_external_without_stderr () {\n \tfi\n }\n \n-# debugging-friendly alternatives to \"test [-f|-d|-e]\"\n-# The commands test the existence or non-existence of $1\n-test_path_is_file () {\n-\ttest \"$#\" -ne 1 && BUG \"1 param\"\n-\tif ! test -f \"$1\"\n-\tthen\n-\t\techo \"File $1 doesn't exist\"\n-\t\tfalse\n-\tfi\n-}\n-\n-test_path_is_dir () {\n-\ttest \"$#\" -ne 1 && BUG \"1 param\"\n-\tif ! test -d \"$1\"\n-\tthen\n-\t\techo \"Directory $1 doesn't exist\"\n-\t\tfalse\n-\tfi\n-}\n-\n-test_path_exists () {\n-\ttest \"$#\" -ne 1 && BUG \"1 param\"\n-\tif ! test -e \"$1\"\n-\tthen\n-\t\techo \"Path $1 doesn't exist\"\n-\t\tfalse\n-\tfi\n-}\n-\n-# Check if the directory exists and is empty as expected, barf otherwise.\n-test_dir_is_empty () {\n-\ttest \"$#\" -ne 1 && BUG \"1 param\"\n-\ttest_path_is_dir \"$1\" &&\n-\tif test -n \"$(ls -a1 \"$1\" | egrep -v '^\\.\\.?$')\"\n-\tthen\n-\t\techo \"Directory '$1' is not empty, it contains:\"\n-\t\tls -la \"$1\"\n-\t\treturn 1\n-\tfi\n-}\n-\n-# Check if the file exists and has a size greater than zero\n-test_file_not_empty () {\n-\ttest \"$#\" = 2 && BUG \"2 param\"\n-\tif ! test -s \"$1\"\n-\tthen\n-\t\techo \"'$1' is not a non-empty file.\"\n-\t\tfalse\n-\tfi\n-}\n-\n-test_path_is_missing () {\n-\ttest \"$#\" -ne 1 && BUG \"1 param\"\n-\tif test -e \"$1\"\n-\tthen\n-\t\techo \"Path exists:\"\n-\t\tls -ld \"$1\"\n-\t\tif test $# -ge 1\n-\t\tthen\n-\t\t\techo \"$*\"\n-\t\tfi\n-\t\tfalse\n-\tfi\n-}\n-\n-# test_line_count checks that a file has the number of lines it\n-# ought to. For example:\n-#\n-#\ttest_expect_success 'produce exactly one line of output' '\n-#\t\tdo something >output &&\n-#\t\ttest_line_count = 1 output\n-#\t'\n-#\n-# is like \"test $(wc -l 0) {\n-\t\t\tmy $s;\n-\t\t\tmy $nread = sysread(STDIN, $s, $len);\n-\t\t\tdie \"cannot read: $!\" unless defined($nread);\n-\t\t\tlast unless $nread;\n-\t\t\tprint $s;\n-\t\t\t$len -= $nread;\n-\t\t}\n-\t' - \"$1\"\n-}\n-\n # run \"$@\" inside a non-git directory\n nongit () {\n \ttest -d non-repo ||\n@@ -1440,54 +1243,6 @@ nongit () {\n \t)\n } 7>&2 2>&4\n \n-# convert function arguments or stdin (if not arguments given) to pktline\n-# representation. If multiple arguments are given, they are separated by\n-# whitespace and put in a single packet. Note that data containing NULs must be\n-# given on stdin, and that empty input becomes an empty packet, not a flush\n-# packet (for that you can just print 0000 yourself).\n-packetize () {\n-\tif test $# -gt 0\n-\tthen\n-\t\tpacket=\"$*\"\n-\t\tprintf '%04x%s' \"$((4 + ${#packet}))\" \"$packet\"\n-\telse\n-\t\tperl -e '\n-\t\t\tmy $packet = do { local $/; };\n-\t\t\tprintf \"%04x%s\", 4 + length($packet), $packet;\n-\t\t'\n-\tfi\n-}\n-\n-# Parse the input as a series of pktlines, writing the result to stdout.\n-# Sideband markers are removed automatically, and the output is routed to\n-# stderr if appropriate.\n-#\n-# NUL bytes are converted to \"\\\\0\" for ease of parsing with text tools.\n-depacketize () {\n-\tperl -e '\n-\t\twhile (read(STDIN, $len, 4) == 4) {\n-\t\t\tif ($len eq \"0000\") {\n-\t\t\t\tprint \"FLUSH\\n\";\n-\t\t\t} else {\n-\t\t\t\tread(STDIN, $buf, hex($len) - 4);\n-\t\t\t\t$buf =~ s/\\0/\\\\0/g;\n-\t\t\t\tif ($buf =~ s/^[\\x2\\x3]//) {\n-\t\t\t\t\tprint STDERR $buf;\n-\t\t\t\t} else {\n-\t\t\t\t\t$buf =~ s/^\\x1//;\n-\t\t\t\t\tprint $buf;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t'\n-}\n-\n-# Converts base-16 data into base-8. The output is given as a sequence of\n-# escaped octals, suitable for consumption by 'printf'.\n-hex2oct () {\n-\tperl -ne 'printf \"\\\\%03o\", hex for /../g'\n-}\n-\n # Set the hash algorithm in use to $1. Only useful when testing the testsuite.\n test_set_hash () {\n \ttest_hash_algo=\"$1\"\n@@ -1611,16 +1366,6 @@ test_set_port () {\n \teval $var=$port\n }\n \n-# Tests for the hidden file attribute on Windows\n-test_path_is_hidden () {\n-\ttest_have_prereq MINGW ||\n-\tBUG \"test_path_is_hidden can only be used on Windows\"\n-\n-\t# Use the output of `attrib`, ignore the absolute path\n-\tcase \"$(\"$SYSTEMROOT\"/system32/attrib \"$1\")\" in *H*?:*) return 0;; esac\n-\treturn 1\n-}\n-\n # Check that the given command was invoked as part of the\n # trace2-format trace on stdin.\n #\ndiff --git a/t/test-lib-functions/debug.sh b/t/test-lib-functions/debug.sh\nnew file mode 100644\nindex 00000000000..4393bf82f02\n--- /dev/null\n+++ b/t/test-lib-functions/debug.sh\n@@ -0,0 +1,99 @@\n+# Included by test-lib.sh via test-lib-functions.sh\n+#\n+# Text munging functions, e.g. wrappers for perl, tr, sed\n+# etc. one-liners.\n+\n+lf_to_nul () {\n+\tperl -pe 'y/\\012/\\000/'\n+}\n+\n+nul_to_q () {\n+\tperl -pe 'y/\\000/Q/'\n+}\n+\n+q_to_nul () {\n+\tperl -pe 'y/Q/\\000/'\n+}\n+\n+q_to_cr () {\n+\ttr Q '\\015'\n+}\n+\n+q_to_tab () {\n+\ttr Q '\\011'\n+}\n+\n+qz_to_tab_space () {\n+\ttr QZ '\\011\\040'\n+}\n+\n+append_cr () {\n+\tsed -e 's/$/Q/' | tr Q '\\015'\n+}\n+\n+remove_cr () {\n+\ttr '\\015' Q | sed -e 's/Q$//'\n+}\n+\n+# Converts base-16 data into base-8. The output is given as a sequence of\n+# escaped octals, suitable for consumption by 'printf'.\n+hex2oct () {\n+\tperl -ne 'printf \"\\\\%03o\", hex for /../g'\n+}\n+\n+# convert function arguments or stdin (if not arguments given) to pktline\n+# representation. If multiple arguments are given, they are separated by\n+# whitespace and put in a single packet. Note that data containing NULs must be\n+# given on stdin, and that empty input becomes an empty packet, not a flush\n+# packet (for that you can just print 0000 yourself).\n+packetize () {\n+\tif test $# -gt 0\n+\tthen\n+\t\tpacket=\"$*\"\n+\t\tprintf '%04x%s' \"$((4 + ${#packet}))\" \"$packet\"\n+\telse\n+\t\tperl -e '\n+\t\t\tmy $packet = do { local $/; };\n+\t\t\tprintf \"%04x%s\", 4 + length($packet), $packet;\n+\t\t'\n+\tfi\n+}\n+\n+# Parse the input as a series of pktlines, writing the result to stdout.\n+# Sideband markers are removed automatically, and the output is routed to\n+# stderr if appropriate.\n+#\n+# NUL bytes are converted to \"\\\\0\" for ease of parsing with text tools.\n+depacketize () {\n+\tperl -e '\n+\t\twhile (read(STDIN, $len, 4) == 4) {\n+\t\t\tif ($len eq \"0000\") {\n+\t\t\t\tprint \"FLUSH\\n\";\n+\t\t\t} else {\n+\t\t\t\tread(STDIN, $buf, hex($len) - 4);\n+\t\t\t\t$buf =~ s/\\0/\\\\0/g;\n+\t\t\t\tif ($buf =~ s/^[\\x2\\x3]//) {\n+\t\t\t\t\tprint STDERR $buf;\n+\t\t\t\t} else {\n+\t\t\t\t\t$buf =~ s/^\\x1//;\n+\t\t\t\t\tprint $buf;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t'\n+}\n+\n+# Read up to \"$1\" bytes (or to EOF) from stdin and write them to stdout.\n+test_copy_bytes () {\n+\tperl -e '\n+\t\tmy $len = $ARGV[1];\n+\t\twhile ($len > 0) {\n+\t\t\tmy $s;\n+\t\t\tmy $nread = sysread(STDIN, $s, $len);\n+\t\t\tdie \"cannot read: $!\" unless defined($nread);\n+\t\t\tlast unless $nread;\n+\t\t\tprint $s;\n+\t\t\t$len -= $nread;\n+\t\t}\n+\t' - \"$1\"\n+}\ndiff --git a/t/test-lib-functions/path.sh b/t/test-lib-functions/path.sh\nnew file mode 100644\nindex 00000000000..af1dd140c27\n--- /dev/null\n+++ b/t/test-lib-functions/path.sh\n@@ -0,0 +1,137 @@\n+# Included by test-lib.sh via test-lib-functions.sh\n+#\n+# File functions, e.g. wrappers for \"test [-e|-s|-f|...]\", \"wc -l\"\n+# etc.\n+\n+# ... test -f\n+test_path_is_file () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\tif ! test -f \"$1\"\n+\tthen\n+\t\techo \"File $1 doesn't exist\"\n+\t\tfalse\n+\tfi\n+}\n+\n+# ... test -d\n+test_path_is_dir () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\tif ! test -d \"$1\"\n+\tthen\n+\t\techo \"Directory $1 doesn't exist\"\n+\t\tfalse\n+\tfi\n+}\n+\n+# test -d && is_empty()\n+test_dir_is_empty () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\ttest_path_is_dir \"$1\" &&\n+\tif test -n \"$(ls -a1 \"$1\" | egrep -v '^\\.\\.?$')\"\n+\tthen\n+\t\techo \"Directory '$1' is not empty, it contains:\"\n+\t\tls -la \"$1\"\n+\t\treturn 1\n+\tfi\n+}\n+\n+# ... test -e\n+test_path_exists () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\tif ! test -e \"$1\"\n+\tthen\n+\t\techo \"Path $1 doesn't exist\"\n+\t\tfalse\n+\tfi\n+}\n+\n+# ... ! test -e\n+test_path_is_missing () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\tif test -e \"$1\"\n+\tthen\n+\t\techo \"Path exists:\"\n+\t\tls -ld \"$1\"\n+\t\tif test $# -ge 1\n+\t\tthen\n+\t\t\techo \"$*\"\n+\t\tfi\n+\t\tfalse\n+\tfi\n+}\n+\n+# ... test -s\n+test_must_be_empty () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\ttest_path_is_file \"$1\" &&\n+\tif test -s \"$1\"\n+\tthen\n+\t\techo \"'$1' is not empty, it contains:\"\n+\t\tcat \"$1\"\n+\t\treturn 1\n+\tfi\n+}\n+\n+# ... ! test -s\n+test_file_not_empty () {\n+\ttest \"$#\" = 2 && BUG \"2 param\"\n+\tif ! test -s \"$1\"\n+\tthen\n+\t\techo \"'$1' is not a non-empty file.\"\n+\t\tfalse\n+\tfi\n+}\n+\n+test_file_size () {\n+\ttest \"$#\" -ne 1 && BUG \"1 param\"\n+\ttest-tool path-utils file-size \"$1\"\n+}\n+\n+# This function helps systems where core.filemode=false is set.\n+# Use it instead of plain 'chmod +x' to set or unset the executable bit\n+# of a file in the working directory and add it to the index.\n+test_chmod () {\n+\tchmod \"$@\" &&\n+\tgit update-index --add \"--chmod=$@\"\n+}\n+\n+# Get the modebits from a file or directory, ignoring the setgid bit (g+s).\n+# This bit is inherited by subdirectories at their creation. So we remove it\n+# from the returning string to prevent callers from having to worry about the\n+# state of the bit in the test directory.\n+test_modebits () {\n+\tls -ld \"$1\" | sed -e 's|^\\(..........\\).*|\\1|' \\\n+\t\t\t -e 's|^\\(......\\)S|\\1-|' -e 's|^\\(......\\)s|\\1x|'\n+}\n+\n+# test_line_count checks that a file has the number of lines it\n+# ought to. For example:\n+#\n+#\ttest_expect_success 'produce exactly one line of output' '\n+#\t\tdo something >output &&\n+#\t\ttest_line_count = 1 output\n+#\t'\n+#\n+# is like \"test $(wc -l