{"thread":{"id":"24697","subject":"[PATCH 0/7] tests: use skip_all=* to skip tests","startedAt":"2010-08-10T19:52:41Z","lastAt":"2010-08-12T17:23:21Z","messageCount":25,"participants":["Ævar Arnfjörð Bjarmason","Junio C Hamano","Johannes Sixt","Raja R Harinath"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"147672","messageId":"1281469968-25670-1-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":null,"subject":"[PATCH 0/7] tests: use skip_all=* to skip tests","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:41Z","receivedAt":"2010-08-10T19:52:41Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Here's another series that changes the skip_all=* usage to prereq\nskipping. I didn't do all the tests that use skip_all=*, but this is a\nlarge chunk of them.\n\nThe motivation is to improve our test metrics. I want to get\nstatistics from the smokers about how many tests are being skipped on\neach platform/OS.\n\nThis is arranged in one commit per patch for ease of reviewing. It\nonly contains the following changes:\n\n  * Change skip_all=* && test_done -> test_set_prereq, then use that\n    prereq with test_expect_success.\n\n  * Setup work for subsequents tests has been moved to tests. This\n    avoids work on platforms where we aren't running the rest of the\n    test, and catches edge cases where the setup work fails for some\n    reason.\n\nÆvar Arnfjörð Bjarmason (7):\n  t/t1304-default-acl: change from skip_all=* to prereq skip\n  t/t5705-clone-2gb: change from skip_all=* to prereq skip\n  t/t7005-editor: change from skip_all=* to prereq skip\n  t/t5503-tagfollow: change from skip_all=* to prereq skip\n  t/t4016-diff-quote: change from skip_all=* to prereq skip\n  t/t3902-quoted: change from skip_all=* to prereq skip\n  t/t3300-funny-names: change from skip_all=* to prereq skip\n\n t/t1304-default-acl.sh |   15 +++++---\n t/t3300-funny-names.sh |   82 +++++++++++++++++++++++++++++++++++-------------\n t/t3902-quoted.sh      |   38 ++++++++++++----------\n t/t4016-diff-quote.sh  |   24 +++++++++-----\n t/t5503-tagfollow.sh   |   33 ++++++++++++++-----\n t/t5705-clone-2gb.sh   |   11 ++----\n t/t7005-editor.sh      |   10 +++---\n 7 files changed, 139 insertions(+), 74 deletions(-)\n\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147673","messageId":"1281469968-25670-2-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:42Z","receivedAt":"2010-08-10T19:52:42Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t1304-default-acl.sh |   15 +++++++++------\n 1 files changed, 9 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh\nindex 97ab02a..0e6cb4f 100755\n--- a/t/t1304-default-acl.sh\n+++ b/t/t1304-default-acl.sh\n@@ -18,11 +18,14 @@ umask 077\n setfacl_out=\"$(setfacl -m u:root:rwx . 2>&1)\"\n setfacl_ret=$?\n \n-if [ $setfacl_ret != 0 ]; then\n-\tskip_all=\"Skipping ACL tests: unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')\"\n-\ttest_done\n+if test $setfacl_ret != 0\n+then\n+\tsay \"Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')\"\n+else\n+\ttest_set_prereq SETFACL\n fi\n \n+\n check_perms_and_acl () {\n \ttest -r \"$1\" &&\n \tgetfacl \"$1\" > actual &&\n@@ -34,7 +37,7 @@ check_perms_and_acl () {\n \n dirs_to_set=\"./ .git/ .git/objects/ .git/objects/pack/\"\n \n-test_expect_success 'Setup test repo' '\n+test_expect_success SETFACL 'Setup test repo' '\n \tsetfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set &&\n \tsetfacl -m m:rwx               $dirs_to_set &&\n \tsetfacl -m u:root:rwx          $dirs_to_set &&\n@@ -46,12 +49,12 @@ test_expect_success 'Setup test repo' '\n \tgit commit -m \"init\"\n '\n \n-test_expect_success 'Objects creation does not break ACLs with restrictive umask' '\n+test_expect_success SETFACL 'Objects creation does not break ACLs with restrictive umask' '\n \t# SHA1 for empty blob\n \tcheck_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391\n '\n \n-test_expect_success 'git gc does not break ACLs with restrictive umask' '\n+test_expect_success SETFACL 'git gc does not break ACLs with restrictive umask' '\n \tgit gc &&\n \tcheck_perms_and_acl .git/objects/pack/*.pack\n '\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147675","messageId":"1281469968-25670-3-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 2/7] t/t5705-clone-2gb: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:43Z","receivedAt":"2010-08-10T19:52:43Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t5705-clone-2gb.sh |   11 ++++-------\n 1 files changed, 4 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t5705-clone-2gb.sh b/t/t5705-clone-2gb.sh\nindex e4d1b6a..694e28d 100755\n--- a/t/t5705-clone-2gb.sh\n+++ b/t/t5705-clone-2gb.sh\n@@ -3,12 +3,9 @@\n test_description='Test cloning a repository larger than 2 gigabyte'\n . ./test-lib.sh\n \n-test -z \"$GIT_TEST_CLONE_2GB\" &&\n-skip_all=\"Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t\" &&\n-test_done &&\n-exit\n+test -n \"$GIT_TEST_CLONE_2GB\" && test_set_prereq CLONE_2GB\n \n-test_expect_success 'setup' '\n+test_expect_success CLONE_2GB 'setup' '\n \n \tgit config pack.compression 0 &&\n \tgit config pack.depth 0 &&\n@@ -36,13 +33,13 @@ test_expect_success 'setup' '\n \n '\n \n-test_expect_success 'clone - bare' '\n+test_expect_success CLONE_2GB 'clone - bare' '\n \n \tgit clone --bare --no-hardlinks . clone-bare\n \n '\n \n-test_expect_success 'clone - with worktree, file:// protocol' '\n+test_expect_success CLONE_2GB 'clone - with worktree, file:// protocol' '\n \n \tgit clone file://. clone-wt\n \n-- \n1.7.2.1.295.gd03d\n"},{"id":"147674","messageId":"1281469968-25670-4-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 3/7] t/t7005-editor: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:44Z","receivedAt":"2010-08-10T19:52:44Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t7005-editor.sh |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t7005-editor.sh b/t/t7005-editor.sh\nindex 26ddf9d..1b530b5 100755\n--- a/t/t7005-editor.sh\n+++ b/t/t7005-editor.sh\n@@ -111,13 +111,13 @@ do\n \t'\n done\n \n-if ! echo 'echo space > \"$1\"' > \"e space.sh\"\n+if echo 'echo space > \"$1\"' > \"e space.sh\"\n then\n-\tskip_all=\"Skipping; FS does not support spaces in filenames\"\n-\ttest_done\n+\t# FS supports spaces in filenames\n+\ttest_set_prereq SPACES_IN_FILENAMES\n fi\n \n-test_expect_success 'editor with a space' '\n+test_expect_success SPACES_IN_FILENAMES 'editor with a space' '\n \n \tchmod a+x \"e space.sh\" &&\n \tGIT_EDITOR=\"./e\\ space.sh\" git commit --amend &&\n@@ -126,7 +126,7 @@ test_expect_success 'editor with a space' '\n '\n \n unset GIT_EDITOR\n-test_expect_success 'core.editor with a space' '\n+test_expect_success SPACES_IN_FILENAMES 'core.editor with a space' '\n \n \tgit config core.editor \\\"./e\\ space.sh\\\" &&\n \tgit commit --amend &&\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147676","messageId":"1281469968-25670-5-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:45Z","receivedAt":"2010-08-10T19:52:45Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t5503-tagfollow.sh |   33 ++++++++++++++++++++++++---------\n 1 files changed, 24 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh\nindex bab1a53..8a298a6 100755\n--- a/t/t5503-tagfollow.sh\n+++ b/t/t5503-tagfollow.sh\n@@ -6,8 +6,11 @@ test_description='test automatic tag following'\n \n case $(uname -s) in\n *MINGW*)\n-\tskip_all=\"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n-\ttest_done\n+\tsay \"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n+\t;;\n+*)\n+\ttest_set_prereq NOT_MINGW\n+\t;;\n esac\n \n # End state of the repository:\n@@ -19,7 +22,7 @@ esac\n #     \\   C - origin/cat    \\\n #      origin/master         master\n \n-test_expect_success setup '\n+test_expect_success NOT_MINGW setup '\n \ttest_tick &&\n \techo ichi >file &&\n \tgit add file &&\n@@ -42,12 +45,15 @@ test_expect_success setup '\n \n U=UPLOAD_LOG\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $A\n #E\n EOF\n-test_expect_success 'fetch A (new commit : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch A (new commit : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -59,7 +65,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"create tag T on A, create C on branch cat\" '\n+test_expect_success NOT_MINGW \"create tag T on A, create C on branch cat\" '\n \tgit tag -a -m tag1 tag1 $A &&\n \tT=$(git rev-parse --verify tag1) &&\n \n@@ -71,13 +77,16 @@ test_expect_success \"create tag T on A, create C on branch cat\" '\n \tgit checkout master\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $C\n want $T\n #E\n EOF\n-test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch C, T (new branch, tag : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -91,7 +100,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"create commits O, B, tag S on B\" '\n+test_expect_success NOT_MINGW \"create commits O, B, tag S on B\" '\n \ttest_tick &&\n \techo O >file &&\n \tgit add file &&\n@@ -107,13 +116,16 @@ test_expect_success \"create commits O, B, tag S on B\" '\n \tS=$(git rev-parse --verify tag2)\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $B\n want $S\n #E\n EOF\n-test_expect_success 'fetch B, S (commit and tag : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch B, S (commit and tag : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -127,13 +139,16 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $B\n want $S\n #E\n EOF\n-test_expect_success 'new clone fetch master and tags' '\n+'\n+\n+test_expect_success NOT_MINGW 'new clone fetch master and tags' '\n \tgit branch -D cat\n \trm -f $U\n \t(\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147678","messageId":"1281469968-25670-6-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 5/7] t/t4016-diff-quote: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:46Z","receivedAt":"2010-08-10T19:52:46Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t4016-diff-quote.sh |   24 ++++++++++++++++--------\n 1 files changed, 16 insertions(+), 8 deletions(-)\n\ndiff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\nindex 34e5144..10e2db3 100755\n--- a/t/t4016-diff-quote.sh\n+++ b/t/t4016-diff-quote.sh\n@@ -11,14 +11,16 @@ test_description='Quoting paths in diff output.\n P0='pathname'\n P1='pathname\twith HT'\n P2='pathname with SP'\n-P3='pathname\n+if P3='pathname\n with LF'\n-: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\" || {\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n+then\n+\ttest_set_prereq TABS_IN_FILENAMES\n+else\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+fi\n \n-test_expect_success setup '\n+test_expect_success TABS_IN_FILENAMES setup '\n \techo P0.0 >\"$P0.0\" &&\n \techo P0.1 >\"$P0.1\" &&\n \techo P0.2 >\"$P0.2\" &&\n@@ -38,6 +40,7 @@ test_expect_success setup '\n \t:\n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect <<\\EOF\n  rename pathname.1 => \"Rpathname\\twith HT.0\" (100%)\n  rename pathname.3 => \"Rpathname\\nwith LF.0\" (100%)\n@@ -47,11 +50,14 @@ cat >expect <<\\EOF\n  rename pathname.0 => Rpathname.0 (100%)\n  rename \"pathname\\twith HT.0\" => Rpathname.1 (100%)\n EOF\n-test_expect_success 'git diff --summary -M HEAD' '\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff --summary -M HEAD' '\n \tgit diff --summary -M HEAD >actual &&\n \ttest_cmp expect actual\n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect <<\\EOF\n  pathname.1 => \"Rpathname\\twith HT.0\"            |    0\n  pathname.3 => \"Rpathname\\nwith LF.0\"            |    0\n@@ -62,7 +68,9 @@ cat >expect <<\\EOF\n  \"pathname\\twith HT.0\" => Rpathname.1            |    0\n  7 files changed, 0 insertions(+), 0 deletions(-)\n EOF\n-test_expect_success 'git diff --stat -M HEAD' '\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '\n \tgit diff --stat -M HEAD >actual &&\n \ttest_cmp expect actual\n '\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147679","messageId":"1281469968-25670-7-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 6/7] t/t3902-quoted: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:47Z","receivedAt":"2010-08-10T19:52:47Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t3902-quoted.sh |   38 +++++++++++++++++++++-----------------\n 1 files changed, 21 insertions(+), 17 deletions(-)\n\ndiff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh\nindex 147e634..7d49469 100755\n--- a/t/t3902-quoted.sh\n+++ b/t/t3902-quoted.sh\n@@ -15,11 +15,13 @@ LF='\n DQ='\"'\n \n echo foo 2>/dev/null > \"Name and an${HT}HT\"\n-test -f \"Name and an${HT}HT\" || {\n-\t# since FAT/NTFS does not allow tabs in filenames, skip this test\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+if ! test -f \"Name and an${HT}HT\"\n+then\n+\t# FAT/NTFS does not allow tabs in filenames\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+else\n+\ttest_set_prereq TABS_IN_FILENAMES\n+fi\n \n for_each_name () {\n \tfor name in \\\n@@ -31,7 +33,7 @@ for_each_name () {\n \tdone\n }\n \n-test_expect_success setup '\n+test_expect_success TABS_IN_FILENAMES 'setup' '\n \n \tmkdir \"$FN\" &&\n \tfor_each_name \"echo initial >\\\"\\$name\\\"\"\n@@ -45,6 +47,7 @@ test_expect_success setup '\n \n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect.quoted <<\\EOF\n Name\n \"Name and a\\nLF\"\n@@ -72,75 +75,76 @@ With SP in it\n 濱野/file\n 濱野純\n EOF\n+'\n \n-test_expect_success 'check fully quoted output from ls-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' '\n \n \tgit ls-files >current && test_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' '\n \n \tgit diff --name-only >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-index' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' '\n \n \tgit diff --name-only HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' '\n \n \tgit diff --name-only HEAD^ HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from ls-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' '\n \n \tgit ls-tree --name-only -r HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'setting core.quotepath' '\n+test_expect_success TABS_IN_FILENAMES 'setting core.quotepath' '\n \n \tgit config --bool core.quotepath false\n \n '\n \n-test_expect_success 'check fully quoted output from ls-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' '\n \n \tgit ls-files >current && test_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' '\n \n \tgit diff --name-only >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-index' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' '\n \n \tgit diff --name-only HEAD >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' '\n \n \tgit diff --name-only HEAD^ HEAD >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from ls-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' '\n \n \tgit ls-tree --name-only -r HEAD >current &&\n \ttest_cmp expect.raw current\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147677","messageId":"1281469968-25670-8-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"[PATCH 7/7] t/t3300-funny-names: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T19:52:48Z","receivedAt":"2010-08-10T19:52:48Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t3300-funny-names.sh |   82 +++++++++++++++++++++++++++++++++++-------------\n 1 files changed, 60 insertions(+), 22 deletions(-)\n\ndiff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh\nindex a99e4d8..f39a261 100755\n--- a/t/t3300-funny-names.sh\n+++ b/t/t3300-funny-names.sh\n@@ -24,19 +24,25 @@ EOF\n cat 2>/dev/null >\"$p1\" \"$p0\"\n echo 'Foo Bar Baz' >\"$p2\"\n \n-test -f \"$p1\" && cmp \"$p0\" \"$p1\" || {\n+if test -f \"$p1\" && cmp \"$p0\" \"$p1\"\n+then\n+    test_set_prereq TABS_IN_FILENAMES\n+else\n \t# since FAT/NTFS does not allow tabs in filenames, skip this test\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+fi\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'just space\n no-funny' >expected\n-test_expect_success 'git ls-files no-funny' \\\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files no-funny' \\\n \t'git update-index --add \"$p0\" \"$p2\" &&\n \tgit ls-files >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n t0=`git write-tree`\n echo \"$t0\" >t0\n \n@@ -45,18 +51,24 @@ just space\n no-funny\n \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git ls-files with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files with-funny' \\\n \t'git update-index --add \"$p1\" &&\n \tgit ls-files >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'just space\n no-funny\n-tabs\t,\" (dq) and spaces' >expected\n-test_expect_success 'git ls-files -z with-funny' \\\n+tabs\t,\\\" (dq) and spaces' >expected\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files -z with-funny' \\\n \t'git ls-files -z | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n t1=`git write-tree`\n echo \"$t1\" >t1\n \n@@ -65,60 +77,78 @@ just space\n no-funny\n \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git ls-tree with funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-tree with funny' \\\n \t'git ls-tree -r $t1 | sed -e \"s/^[^\t]*\t//\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n A\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-index with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-index with-funny' \\\n \t'git diff-index --name-status $t0 >current &&\n \ttest_cmp expected current'\n \n-test_expect_success 'git diff-tree with-funny' \\\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree with-funny' \\\n \t'git diff-tree --name-status $t0 $t1 >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'A\n-tabs\t,\" (dq) and spaces' >expected\n-test_expect_success 'git diff-index -z with-funny' \\\n+tabs\t,\\\" (dq) and spaces' >expected\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-index -z with-funny' \\\n \t'git diff-index -z --name-status $t0 | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n-test_expect_success 'git diff-tree -z with-funny' \\\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree -z with-funny' \\\n \t'git diff-tree -z --name-status $t0 $t1 | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n CNUM\tno-funny\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree -C with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree -C with-funny' \\\n \t'git diff-tree -C --find-copies-harder --name-status \\\n \t\t$t0 $t1 | sed -e 's/^C[0-9]*/CNUM/' >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n RNUM\tno-funny\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git update-index --force-remove \"$p0\" &&\n \tgit diff-index -M --name-status \\\n \t\t$t0 | sed -e 's/^R[0-9]*/RNUM/' >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n diff --git a/no-funny \"b/tabs\\t,\\\" (dq) and spaces\"\n similarity index NUM%\n rename from no-funny\n rename to \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git diff-index -M -p $t0 |\n \t sed -e \"s/index [0-9]*%/index NUM%/\" >current &&\n \t test_cmp expected current'\n \n-chmod +x \"$p1\"\n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n+chmod +x \"$p1\" &&\n cat > expected <<\\EOF\n diff --git a/no-funny \"b/tabs\\t,\\\" (dq) and spaces\"\n old mode 100644\n@@ -127,31 +157,39 @@ similarity index NUM%\n rename from no-funny\n rename to \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git diff-index -M -p $t0 |\n \t sed -e \"s/index [0-9]*%/index NUM%/\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat >expected <<\\EOF\n  \"tabs\\t,\\\" (dq) and spaces\"\n  1 files changed, 0 insertions(+), 0 deletions(-)\n EOF\n-test_expect_success 'git diff-tree rename with-funny applied' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \\\n \t'git diff-index -M -p $t0 |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n  no-funny\n  \"tabs\\t,\\\" (dq) and spaces\"\n  2 files changed, 3 insertions(+), 3 deletions(-)\n EOF\n-test_expect_success 'git diff-tree delete with-funny applied' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \\\n \t'git diff-index -p $t0 |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n \t test_cmp expected current'\n \n-test_expect_success 'git apply non-git diff' \\\n+test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \\\n \t'git diff-index -p $t0 |\n \t sed -ne \"/^[-+@]/p\" |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n-- \n1.7.2.1.295.gd03d\n"},{"id":"147801","messageId":"7vtyn1xaom.fsf@alter.siamese.dyndns.org","threadId":"24697","inReplyTo":"1281469968-25670-5-git-send-email-avarab@gmail.com","subject":"Re: [PATCH 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-11T18:32:09Z","receivedAt":"2010-08-11T18:32:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh\n> index bab1a53..8a298a6 100755\n> --- a/t/t5503-tagfollow.sh\n> +++ b/t/t5503-tagfollow.sh\n> @@ -6,8 +6,11 @@ test_description='test automatic tag following'\n>  \n>  case $(uname -s) in\n>  *MINGW*)\n> -\tskip_all=\"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n> -\ttest_done\n> +\tsay \"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n> +\t;;\n> +*)\n> +\ttest_set_prereq NOT_MINGW\n> +\t;;\n>  esac\n\nTo Ævar; isn't the prerequisite for these tests \"does our git support send\npack debugging?\" not \"are we not running on mingw?\"  Let's call it\nDEBUG_SEND_PACK or something.\n\nTo J6t; does the assumption here still hold, or do we support send pack\ndebugging these days?\n"},{"id":"147804","messageId":"7vocd9xaog.fsf@alter.siamese.dyndns.org","threadId":"24697","inReplyTo":"1281469968-25670-6-git-send-email-avarab@gmail.com","subject":"Re: [PATCH 5/7] t/t4016-diff-quote: change from skip_all=* to prereq skip","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-11T18:32:15Z","receivedAt":"2010-08-11T18:32:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\n> index 34e5144..10e2db3 100755\n> --- a/t/t4016-diff-quote.sh\n> +++ b/t/t4016-diff-quote.sh\n> @@ -11,14 +11,16 @@ test_description='Quoting paths in diff output.\n>  P0='pathname'\n>  P1='pathname\twith HT'\n>  P2='pathname with SP'\n> +if P3='pathname\n>  with LF'\n> +: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n> +then\n> +\ttest_set_prereq TABS_IN_FILENAMES\n> +else\n> +\tsay 'Your filesystem does not allow tabs in filenames'\n> +fi\n\nDid you really mean to have that \"if\" before assignment to P3, and if so\nwhy (as opposed to \"after assignment to P3\" or \"before assignment to P0\")?\n"},{"id":"147805","messageId":"7viq3hxao9.fsf@alter.siamese.dyndns.org","threadId":"24697","inReplyTo":"1281469968-25670-3-git-send-email-avarab@gmail.com","subject":"Re: [PATCH 2/7] t/t5705-clone-2gb: change from skip_all=* to prereq skip","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-11T18:32:22Z","receivedAt":"2010-08-11T18:32:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> Change this test to skip test with test prerequisites, and to do setup\n> work in tests. This improves the skipped statistics on platforms where\n> the test isn't run.\n>\n> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n> ---\n>  t/t5705-clone-2gb.sh |   11 ++++-------\n>  1 files changed, 4 insertions(+), 7 deletions(-)\n>\n> diff --git a/t/t5705-clone-2gb.sh b/t/t5705-clone-2gb.sh\n> index e4d1b6a..694e28d 100755\n> --- a/t/t5705-clone-2gb.sh\n> +++ b/t/t5705-clone-2gb.sh\n> @@ -3,12 +3,9 @@\n>  test_description='Test cloning a repository larger than 2 gigabyte'\n>  . ./test-lib.sh\n>  \n> -test -z \"$GIT_TEST_CLONE_2GB\" &&\n> -skip_all=\"Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t\" &&\n> -test_done &&\n> -exit\n> +test -n \"$GIT_TEST_CLONE_2GB\" && test_set_prereq CLONE_2GB\n\nIn your 6/7 you preserve the \"skipping\" message with \"say\"; don't you want\nto do the same here?\n"},{"id":"147806","messageId":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","threadId":"24697","inReplyTo":"1281469968-25670-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH 0/7] tests: use skip_all=* to skip tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-11T18:32:30Z","receivedAt":"2010-08-11T18:32:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Except for a few which I'll comment separately all of these looked\nreasonable (I didn't look at 7/7 very carefully, though).\n\nThanks.\n"},{"id":"147809","messageId":"AANLkTimcft23Tbe9=iFPvNyf6Goyk6jBQ1XCzsQJeNtv@mail.gmail.com","threadId":"24697","inReplyTo":"7vtyn1xaom.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T18:47:07Z","receivedAt":"2010-08-11T18:47:07Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Aug 11, 2010 at 18:32, Junio C Hamano <gitster@pobox.com> wrote:\n> To Ævar; isn't the prerequisite for these tests \"does our git support send\n> pack debugging?\" not \"are we not running on mingw?\"  Let's call it\n> DEBUG_SEND_PACK or something.\n\nI have no idea, sorry. I was just changing the way we do skips. I\ndon't have access to a Windows system, and I don't know if this skip\nshould be uname -s based.\n"},{"id":"147810","messageId":"1281553450-26467-1-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 0/7] tests: use skip_all=* to skip tests","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:03Z","receivedAt":"2010-08-11T19:04:03Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Aug 11, 2010 at 18:32, Junio C Hamano <gitster@pobox.com> wrote:\n> Except for a few which I'll comment separately all of these looked\n> reasonable (I didn't look at 7/7 very carefully, though).\n\nThanks for the review. Here's a v2 that fixes the isssues raised.\n\nLike v1 aside from these fixes, all but one spotted by Junio:\n    \n    diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh\n    index 0e6cb4f..b5d89a2 100755\n    --- a/t/t1304-default-acl.sh\n    +++ b/t/t1304-default-acl.sh\n    @@ -28 +27,0 @@ fi\n    -\n    diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\n    index 10e2db3..ab0c2f0 100755\n    --- a/t/t4016-diff-quote.sh\n    +++ b/t/t4016-diff-quote.sh\n    @@ -14 +14 @@ P2='pathname with SP'\n    -if P3='pathname\n    +P3='pathname\n    @@ -16 +16 @@ with LF'\n    -: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n    +if : 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n    diff --git a/t/t5705-clone-2gb.sh b/t/t5705-clone-2gb.sh\n    index 694e28d..e9783c3 100755\n    --- a/t/t5705-clone-2gb.sh\n    +++ b/t/t5705-clone-2gb.sh\n    @@ -6 +6,6 @@ test_description='Test cloning a repository larger than 2 gigabyte'\n    -test -n \"$GIT_TEST_CLONE_2GB\" && test_set_prereq CLONE_2GB\n    +if test -z \"$GIT_TEST_CLONE_2GB\"\n    +then\n    +       say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'\n    +else\n    +       test_set_prereq CLONE_2GB\n    +fi\n\nÆvar Arnfjörð Bjarmason (7):\n  t/t1304-default-acl: change from skip_all=* to prereq skip\n  t/t5705-clone-2gb: change from skip_all=* to prereq skip\n  t/t7005-editor: change from skip_all=* to prereq skip\n  t/t5503-tagfollow: change from skip_all=* to prereq skip\n  t/t4016-diff-quote: change from skip_all=* to prereq skip\n  t/t3902-quoted: change from skip_all=* to prereq skip\n  t/t3300-funny-names: change from skip_all=* to prereq skip\n\n t/t1304-default-acl.sh |   14 +++++---\n t/t3300-funny-names.sh |   82 +++++++++++++++++++++++++++++++++++-------------\n t/t3902-quoted.sh      |   38 ++++++++++++----------\n t/t4016-diff-quote.sh  |   22 +++++++++----\n t/t5503-tagfollow.sh   |   33 ++++++++++++++-----\n t/t5705-clone-2gb.sh   |   16 +++++----\n t/t7005-editor.sh      |   10 +++---\n 7 files changed, 142 insertions(+), 73 deletions(-)\n\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147812","messageId":"1281553450-26467-2-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 1/7] t/t1304-default-acl: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:04Z","receivedAt":"2010-08-11T19:04:04Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t1304-default-acl.sh |   14 ++++++++------\n 1 files changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh\nindex 97ab02a..b5d89a2 100755\n--- a/t/t1304-default-acl.sh\n+++ b/t/t1304-default-acl.sh\n@@ -18,9 +18,11 @@ umask 077\n setfacl_out=\"$(setfacl -m u:root:rwx . 2>&1)\"\n setfacl_ret=$?\n \n-if [ $setfacl_ret != 0 ]; then\n-\tskip_all=\"Skipping ACL tests: unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')\"\n-\ttest_done\n+if test $setfacl_ret != 0\n+then\n+\tsay \"Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')\"\n+else\n+\ttest_set_prereq SETFACL\n fi\n \n check_perms_and_acl () {\n@@ -34,7 +36,7 @@ check_perms_and_acl () {\n \n dirs_to_set=\"./ .git/ .git/objects/ .git/objects/pack/\"\n \n-test_expect_success 'Setup test repo' '\n+test_expect_success SETFACL 'Setup test repo' '\n \tsetfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set &&\n \tsetfacl -m m:rwx               $dirs_to_set &&\n \tsetfacl -m u:root:rwx          $dirs_to_set &&\n@@ -46,12 +48,12 @@ test_expect_success 'Setup test repo' '\n \tgit commit -m \"init\"\n '\n \n-test_expect_success 'Objects creation does not break ACLs with restrictive umask' '\n+test_expect_success SETFACL 'Objects creation does not break ACLs with restrictive umask' '\n \t# SHA1 for empty blob\n \tcheck_perms_and_acl .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391\n '\n \n-test_expect_success 'git gc does not break ACLs with restrictive umask' '\n+test_expect_success SETFACL 'git gc does not break ACLs with restrictive umask' '\n \tgit gc &&\n \tcheck_perms_and_acl .git/objects/pack/*.pack\n '\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147811","messageId":"1281553450-26467-3-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 2/7] t/t5705-clone-2gb: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:05Z","receivedAt":"2010-08-11T19:04:05Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t5705-clone-2gb.sh |   16 +++++++++-------\n 1 files changed, 9 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t5705-clone-2gb.sh b/t/t5705-clone-2gb.sh\nindex e4d1b6a..e9783c3 100755\n--- a/t/t5705-clone-2gb.sh\n+++ b/t/t5705-clone-2gb.sh\n@@ -3,12 +3,14 @@\n test_description='Test cloning a repository larger than 2 gigabyte'\n . ./test-lib.sh\n \n-test -z \"$GIT_TEST_CLONE_2GB\" &&\n-skip_all=\"Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t\" &&\n-test_done &&\n-exit\n+if test -z \"$GIT_TEST_CLONE_2GB\"\n+then\n+\tsay 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'\n+else\n+\ttest_set_prereq CLONE_2GB\n+fi\n \n-test_expect_success 'setup' '\n+test_expect_success CLONE_2GB 'setup' '\n \n \tgit config pack.compression 0 &&\n \tgit config pack.depth 0 &&\n@@ -36,13 +38,13 @@ test_expect_success 'setup' '\n \n '\n \n-test_expect_success 'clone - bare' '\n+test_expect_success CLONE_2GB 'clone - bare' '\n \n \tgit clone --bare --no-hardlinks . clone-bare\n \n '\n \n-test_expect_success 'clone - with worktree, file:// protocol' '\n+test_expect_success CLONE_2GB 'clone - with worktree, file:// protocol' '\n \n \tgit clone file://. clone-wt\n \n-- \n1.7.2.1.295.gdf931\n"},{"id":"147816","messageId":"1281553450-26467-4-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 3/7] t/t7005-editor: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:06Z","receivedAt":"2010-08-11T19:04:06Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t7005-editor.sh |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t7005-editor.sh b/t/t7005-editor.sh\nindex 26ddf9d..1b530b5 100755\n--- a/t/t7005-editor.sh\n+++ b/t/t7005-editor.sh\n@@ -111,13 +111,13 @@ do\n \t'\n done\n \n-if ! echo 'echo space > \"$1\"' > \"e space.sh\"\n+if echo 'echo space > \"$1\"' > \"e space.sh\"\n then\n-\tskip_all=\"Skipping; FS does not support spaces in filenames\"\n-\ttest_done\n+\t# FS supports spaces in filenames\n+\ttest_set_prereq SPACES_IN_FILENAMES\n fi\n \n-test_expect_success 'editor with a space' '\n+test_expect_success SPACES_IN_FILENAMES 'editor with a space' '\n \n \tchmod a+x \"e space.sh\" &&\n \tGIT_EDITOR=\"./e\\ space.sh\" git commit --amend &&\n@@ -126,7 +126,7 @@ test_expect_success 'editor with a space' '\n '\n \n unset GIT_EDITOR\n-test_expect_success 'core.editor with a space' '\n+test_expect_success SPACES_IN_FILENAMES 'core.editor with a space' '\n \n \tgit config core.editor \\\"./e\\ space.sh\\\" &&\n \tgit commit --amend &&\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147817","messageId":"1281553450-26467-5-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:07Z","receivedAt":"2010-08-11T19:04:07Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t5503-tagfollow.sh |   33 ++++++++++++++++++++++++---------\n 1 files changed, 24 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh\nindex bab1a53..8a298a6 100755\n--- a/t/t5503-tagfollow.sh\n+++ b/t/t5503-tagfollow.sh\n@@ -6,8 +6,11 @@ test_description='test automatic tag following'\n \n case $(uname -s) in\n *MINGW*)\n-\tskip_all=\"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n-\ttest_done\n+\tsay \"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n+\t;;\n+*)\n+\ttest_set_prereq NOT_MINGW\n+\t;;\n esac\n \n # End state of the repository:\n@@ -19,7 +22,7 @@ esac\n #     \\   C - origin/cat    \\\n #      origin/master         master\n \n-test_expect_success setup '\n+test_expect_success NOT_MINGW setup '\n \ttest_tick &&\n \techo ichi >file &&\n \tgit add file &&\n@@ -42,12 +45,15 @@ test_expect_success setup '\n \n U=UPLOAD_LOG\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $A\n #E\n EOF\n-test_expect_success 'fetch A (new commit : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch A (new commit : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -59,7 +65,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"create tag T on A, create C on branch cat\" '\n+test_expect_success NOT_MINGW \"create tag T on A, create C on branch cat\" '\n \tgit tag -a -m tag1 tag1 $A &&\n \tT=$(git rev-parse --verify tag1) &&\n \n@@ -71,13 +77,16 @@ test_expect_success \"create tag T on A, create C on branch cat\" '\n \tgit checkout master\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $C\n want $T\n #E\n EOF\n-test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch C, T (new branch, tag : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -91,7 +100,7 @@ test_expect_success 'fetch C, T (new branch, tag : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"create commits O, B, tag S on B\" '\n+test_expect_success NOT_MINGW \"create commits O, B, tag S on B\" '\n \ttest_tick &&\n \techo O >file &&\n \tgit add file &&\n@@ -107,13 +116,16 @@ test_expect_success \"create commits O, B, tag S on B\" '\n \tS=$(git rev-parse --verify tag2)\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $B\n want $S\n #E\n EOF\n-test_expect_success 'fetch B, S (commit and tag : 1 connection)' '\n+'\n+\n+test_expect_success NOT_MINGW 'fetch B, S (commit and tag : 1 connection)' '\n \trm -f $U\n \t(\n \t\tcd cloned &&\n@@ -127,13 +139,16 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success NOT_MINGW 'setup expect' '\n cat - <<EOF >expect\n #S\n want $B\n want $S\n #E\n EOF\n-test_expect_success 'new clone fetch master and tags' '\n+'\n+\n+test_expect_success NOT_MINGW 'new clone fetch master and tags' '\n \tgit branch -D cat\n \trm -f $U\n \t(\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147814","messageId":"1281553450-26467-6-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 5/7] t/t4016-diff-quote: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:08Z","receivedAt":"2010-08-11T19:04:08Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t4016-diff-quote.sh |   22 +++++++++++++++-------\n 1 files changed, 15 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\nindex 34e5144..ab0c2f0 100755\n--- a/t/t4016-diff-quote.sh\n+++ b/t/t4016-diff-quote.sh\n@@ -13,12 +13,14 @@ P1='pathname\twith HT'\n P2='pathname with SP'\n P3='pathname\n with LF'\n-: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\" || {\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+if : 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n+then\n+\ttest_set_prereq TABS_IN_FILENAMES\n+else\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+fi\n \n-test_expect_success setup '\n+test_expect_success TABS_IN_FILENAMES setup '\n \techo P0.0 >\"$P0.0\" &&\n \techo P0.1 >\"$P0.1\" &&\n \techo P0.2 >\"$P0.2\" &&\n@@ -38,6 +40,7 @@ test_expect_success setup '\n \t:\n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect <<\\EOF\n  rename pathname.1 => \"Rpathname\\twith HT.0\" (100%)\n  rename pathname.3 => \"Rpathname\\nwith LF.0\" (100%)\n@@ -47,11 +50,14 @@ cat >expect <<\\EOF\n  rename pathname.0 => Rpathname.0 (100%)\n  rename \"pathname\\twith HT.0\" => Rpathname.1 (100%)\n EOF\n-test_expect_success 'git diff --summary -M HEAD' '\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff --summary -M HEAD' '\n \tgit diff --summary -M HEAD >actual &&\n \ttest_cmp expect actual\n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect <<\\EOF\n  pathname.1 => \"Rpathname\\twith HT.0\"            |    0\n  pathname.3 => \"Rpathname\\nwith LF.0\"            |    0\n@@ -62,7 +68,9 @@ cat >expect <<\\EOF\n  \"pathname\\twith HT.0\" => Rpathname.1            |    0\n  7 files changed, 0 insertions(+), 0 deletions(-)\n EOF\n-test_expect_success 'git diff --stat -M HEAD' '\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '\n \tgit diff --stat -M HEAD >actual &&\n \ttest_cmp expect actual\n '\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147815","messageId":"1281553450-26467-7-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 6/7] t/t3902-quoted: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:09Z","receivedAt":"2010-08-11T19:04:09Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t3902-quoted.sh |   38 +++++++++++++++++++++-----------------\n 1 files changed, 21 insertions(+), 17 deletions(-)\n\ndiff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh\nindex 147e634..7d49469 100755\n--- a/t/t3902-quoted.sh\n+++ b/t/t3902-quoted.sh\n@@ -15,11 +15,13 @@ LF='\n DQ='\"'\n \n echo foo 2>/dev/null > \"Name and an${HT}HT\"\n-test -f \"Name and an${HT}HT\" || {\n-\t# since FAT/NTFS does not allow tabs in filenames, skip this test\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+if ! test -f \"Name and an${HT}HT\"\n+then\n+\t# FAT/NTFS does not allow tabs in filenames\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+else\n+\ttest_set_prereq TABS_IN_FILENAMES\n+fi\n \n for_each_name () {\n \tfor name in \\\n@@ -31,7 +33,7 @@ for_each_name () {\n \tdone\n }\n \n-test_expect_success setup '\n+test_expect_success TABS_IN_FILENAMES 'setup' '\n \n \tmkdir \"$FN\" &&\n \tfor_each_name \"echo initial >\\\"\\$name\\\"\"\n@@ -45,6 +47,7 @@ test_expect_success setup '\n \n '\n \n+test_expect_success TABS_IN_FILENAMES 'setup expected files' '\n cat >expect.quoted <<\\EOF\n Name\n \"Name and a\\nLF\"\n@@ -72,75 +75,76 @@ With SP in it\n 濱野/file\n 濱野純\n EOF\n+'\n \n-test_expect_success 'check fully quoted output from ls-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' '\n \n \tgit ls-files >current && test_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' '\n \n \tgit diff --name-only >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-index' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' '\n \n \tgit diff --name-only HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' '\n \n \tgit diff --name-only HEAD^ HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'check fully quoted output from ls-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' '\n \n \tgit ls-tree --name-only -r HEAD >current &&\n \ttest_cmp expect.quoted current\n \n '\n \n-test_expect_success 'setting core.quotepath' '\n+test_expect_success TABS_IN_FILENAMES 'setting core.quotepath' '\n \n \tgit config --bool core.quotepath false\n \n '\n \n-test_expect_success 'check fully quoted output from ls-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' '\n \n \tgit ls-files >current && test_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-files' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' '\n \n \tgit diff --name-only >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-index' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' '\n \n \tgit diff --name-only HEAD >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from diff-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' '\n \n \tgit diff --name-only HEAD^ HEAD >current &&\n \ttest_cmp expect.raw current\n \n '\n \n-test_expect_success 'check fully quoted output from ls-tree' '\n+test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' '\n \n \tgit ls-tree --name-only -r HEAD >current &&\n \ttest_cmp expect.raw current\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147813","messageId":"1281553450-26467-8-git-send-email-avarab@gmail.com","threadId":"24697","inReplyTo":"7vd3tpxao1.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 7/7] t/t3300-funny-names: change from skip_all=* to prereq skip","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-11T19:04:10Z","receivedAt":"2010-08-11T19:04:10Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Change this test to skip test with test prerequisites, and to do setup\nwork in tests. This improves the skipped statistics on platforms where\nthe test isn't run.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n t/t3300-funny-names.sh |   82 +++++++++++++++++++++++++++++++++++-------------\n 1 files changed, 60 insertions(+), 22 deletions(-)\n\ndiff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh\nindex a99e4d8..f39a261 100755\n--- a/t/t3300-funny-names.sh\n+++ b/t/t3300-funny-names.sh\n@@ -24,19 +24,25 @@ EOF\n cat 2>/dev/null >\"$p1\" \"$p0\"\n echo 'Foo Bar Baz' >\"$p2\"\n \n-test -f \"$p1\" && cmp \"$p0\" \"$p1\" || {\n+if test -f \"$p1\" && cmp \"$p0\" \"$p1\"\n+then\n+    test_set_prereq TABS_IN_FILENAMES\n+else\n \t# since FAT/NTFS does not allow tabs in filenames, skip this test\n-\tskip_all='Your filesystem does not allow tabs in filenames, test skipped.'\n-\ttest_done\n-}\n+\tsay 'Your filesystem does not allow tabs in filenames'\n+fi\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'just space\n no-funny' >expected\n-test_expect_success 'git ls-files no-funny' \\\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files no-funny' \\\n \t'git update-index --add \"$p0\" \"$p2\" &&\n \tgit ls-files >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n t0=`git write-tree`\n echo \"$t0\" >t0\n \n@@ -45,18 +51,24 @@ just space\n no-funny\n \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git ls-files with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files with-funny' \\\n \t'git update-index --add \"$p1\" &&\n \tgit ls-files >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'just space\n no-funny\n-tabs\t,\" (dq) and spaces' >expected\n-test_expect_success 'git ls-files -z with-funny' \\\n+tabs\t,\\\" (dq) and spaces' >expected\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-files -z with-funny' \\\n \t'git ls-files -z | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n t1=`git write-tree`\n echo \"$t1\" >t1\n \n@@ -65,60 +77,78 @@ just space\n no-funny\n \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git ls-tree with funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git ls-tree with funny' \\\n \t'git ls-tree -r $t1 | sed -e \"s/^[^\t]*\t//\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n A\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-index with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-index with-funny' \\\n \t'git diff-index --name-status $t0 >current &&\n \ttest_cmp expected current'\n \n-test_expect_success 'git diff-tree with-funny' \\\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree with-funny' \\\n \t'git diff-tree --name-status $t0 $t1 >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' \"\n echo 'A\n-tabs\t,\" (dq) and spaces' >expected\n-test_expect_success 'git diff-index -z with-funny' \\\n+tabs\t,\\\" (dq) and spaces' >expected\n+\"\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-index -z with-funny' \\\n \t'git diff-index -z --name-status $t0 | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n-test_expect_success 'git diff-tree -z with-funny' \\\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree -z with-funny' \\\n \t'git diff-tree -z --name-status $t0 $t1 | perl -pe y/\\\\000/\\\\012/ >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n CNUM\tno-funny\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree -C with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree -C with-funny' \\\n \t'git diff-tree -C --find-copies-harder --name-status \\\n \t\t$t0 $t1 | sed -e 's/^C[0-9]*/CNUM/' >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n RNUM\tno-funny\t\"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git update-index --force-remove \"$p0\" &&\n \tgit diff-index -M --name-status \\\n \t\t$t0 | sed -e 's/^R[0-9]*/RNUM/' >current &&\n \ttest_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n diff --git a/no-funny \"b/tabs\\t,\\\" (dq) and spaces\"\n similarity index NUM%\n rename from no-funny\n rename to \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git diff-index -M -p $t0 |\n \t sed -e \"s/index [0-9]*%/index NUM%/\" >current &&\n \t test_cmp expected current'\n \n-chmod +x \"$p1\"\n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n+chmod +x \"$p1\" &&\n cat > expected <<\\EOF\n diff --git a/no-funny \"b/tabs\\t,\\\" (dq) and spaces\"\n old mode 100644\n@@ -127,31 +157,39 @@ similarity index NUM%\n rename from no-funny\n rename to \"tabs\\t,\\\" (dq) and spaces\"\n EOF\n-test_expect_success 'git diff-tree delete with-funny' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \\\n \t'git diff-index -M -p $t0 |\n \t sed -e \"s/index [0-9]*%/index NUM%/\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat >expected <<\\EOF\n  \"tabs\\t,\\\" (dq) and spaces\"\n  1 files changed, 0 insertions(+), 0 deletions(-)\n EOF\n-test_expect_success 'git diff-tree rename with-funny applied' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \\\n \t'git diff-index -M -p $t0 |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n \t test_cmp expected current'\n \n+test_expect_success TABS_IN_FILENAMES 'setup expect' '\n cat > expected <<\\EOF\n  no-funny\n  \"tabs\\t,\\\" (dq) and spaces\"\n  2 files changed, 3 insertions(+), 3 deletions(-)\n EOF\n-test_expect_success 'git diff-tree delete with-funny applied' \\\n+'\n+\n+test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \\\n \t'git diff-index -p $t0 |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n \t test_cmp expected current'\n \n-test_expect_success 'git apply non-git diff' \\\n+test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \\\n \t'git diff-index -p $t0 |\n \t sed -ne \"/^[-+@]/p\" |\n \t git apply --stat | sed -e \"s/|.*//\" -e \"s/ *\\$//\" >current &&\n-- \n1.7.2.1.295.gdf931\n"},{"id":"147829","messageId":"201008112220.40864.j6t@kdbg.org","threadId":"24697","inReplyTo":"7vtyn1xaom.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2010-08-11T20:20:40Z","receivedAt":"2010-08-11T20:20:40Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"On Mittwoch, 11. August 2010, Junio C Hamano wrote:\n> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n> > diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh\n> > index bab1a53..8a298a6 100755\n> > --- a/t/t5503-tagfollow.sh\n> > +++ b/t/t5503-tagfollow.sh\n> > @@ -6,8 +6,11 @@ test_description='test automatic tag following'\n> >\n> >  case $(uname -s) in\n> >  *MINGW*)\n> > -\tskip_all=\"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n> > -\ttest_done\n> > +\tsay \"GIT_DEBUG_SEND_PACK not supported - skipping tests\"\n> > +\t;;\n> > +*)\n> > +\ttest_set_prereq NOT_MINGW\n> > +\t;;\n> >  esac\n>\n> To Ævar; isn't the prerequisite for these tests \"does our git support send\n> pack debugging?\" not \"are we not running on mingw?\"  Let's call it\n> DEBUG_SEND_PACK or something.\n>\n> To J6t; does the assumption here still hold, or do we support send pack\n> debugging these days?\n\nGIT_DEBUG_SEND_PACK is still not supported on Windows.\n\n-- Hannes\n"},{"id":"147875","messageId":"87zkwsxsd0.fsf_-_@hariville.hurrynot.org","threadId":"24697","inReplyTo":"1281553450-26467-1-git-send-email-avarab@gmail.com","subject":"case where diff output needs improving? (was Re: [PATCH v2 0/7] tests: use skip_all=* to skip tests)","fromName":"Raja R Harinath","fromEmail":"harinath@hurrynot.org","sentAt":"2010-08-12T06:22:35Z","receivedAt":"2010-08-12T06:22:35Z","isPatch":true,"sender":{"key":"harinath@hurrynot.org","avatar":"https://avatars.githubusercontent.com/u/4610?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n[snip]     \n>     diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\n>     index 10e2db3..ab0c2f0 100755\n>     --- a/t/t4016-diff-quote.sh\n>     +++ b/t/t4016-diff-quote.sh\n>     @@ -14 +14 @@ P2='pathname with SP'\n>     -if P3='pathname\n>     +P3='pathname\n>     @@ -16 +16 @@ with LF'\n>     -: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n>     +if : 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n\nAssuming this was from a git invocation, it seems that 'diff' could just\nshow line 15 instead of '@@ -16, +16 @@' above.\n\n- Hari\n"},{"id":"147877","messageId":"AANLkTiktfhsFWuS5V9aBcuUwQUUAvkc3+q4rhZhTarYP@mail.gmail.com","threadId":"24697","inReplyTo":"87zkwsxsd0.fsf_-_@hariville.hurrynot.org","subject":"Re: case where diff output needs improving? (was Re: [PATCH v2 0/7] tests: use skip_all=* to skip tests)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-12T06:43:38Z","receivedAt":"2010-08-12T06:43:38Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Thu, Aug 12, 2010 at 06:22, Raja R Harinath <harinath@hurrynot.org> wrote:\n> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n>\n> [snip]\n>>     diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\n>>     index 10e2db3..ab0c2f0 100755\n>>     --- a/t/t4016-diff-quote.sh\n>>     +++ b/t/t4016-diff-quote.sh\n>>     @@ -14 +14 @@ P2='pathname with SP'\n>>     -if P3='pathname\n>>     +P3='pathname\n>>     @@ -16 +16 @@ with LF'\n>>     -: 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n>>     +if : 2>/dev/null >\"$P1\" && test -f \"$P1\" && rm -f \"$P1\"\n>\n> Assuming this was from a git invocation, it seems that 'diff' could just\n> show line 15 instead of '@@ -16, +16 @@' above.\n\nThat was from -U0, and showing line 15 would go against the -U0 parameter.\n"},{"id":"147923","messageId":"7vtymzsq2e.fsf@alter.siamese.dyndns.org","threadId":"24697","inReplyTo":"AANLkTimcft23Tbe9=iFPvNyf6Goyk6jBQ1XCzsQJeNtv@mail.gmail.com","subject":"Re: [PATCH 4/7] t/t5503-tagfollow: change from skip_all=* to prereq skip","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-12T17:23:21Z","receivedAt":"2010-08-12T17:23:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> On Wed, Aug 11, 2010 at 18:32, Junio C Hamano <gitster@pobox.com> wrote:\n>> To Ævar; isn't the prerequisite for these tests \"does our git support send\n>> pack debugging?\" not \"are we not running on mingw?\"  Let's call it\n>> DEBUG_SEND_PACK or something.\n>\n> I have no idea, sorry. I was just changing the way we do skips. I\n> don't have access to a Windows system, and I don't know if this skip\n> should be uname -s based.\n\nOk, somebody who adds a port that does not support git-send-pack debugging\ncan worry about updating this later; for now, \"the platform is mingw\" and\n\"the platform does not support send-pack debugging\" are the same thing.\n"}]}