From: "Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/3] t: rework tests for --pathspec-from-file
Date: Mon, 30 Dec 2019 19:15:25 +0000 [thread overview]
Message-ID: <pull.503.v2.git.1577733329.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.503.git.1577727747.gitgitgadget@gmail.com>
Please refer to commit messages for rationale.
This branch is a follow-up for [1] where part of branch was merged into `master` via [2].
Previously in [3] there were some concerns on whether removing
copy&pasted tests is good. I still think that yes, it 's a good thing,
mostly because of high volume of potential 13*6=78 duplicate tests.
Still, I separated this change as last patch, so that the remaining
part of the branch can be taken without it.
[1] https://lore.kernel.org/git/pull.490.git.1576161385.gitgitgadget@gmail.com/
[2] https://public-inbox.org/git/pull.445.v4.git.1575381738.gitgitgadget@gmail.com/
[3] https://lore.kernel.org/git/xmqqwoatcn5u.fsf@gitster-ct.c.googlers.com/
Changes since V1
----------------
Small code formatting changes suggested in V1.
Alexandr Miloslavskiy (3):
t: fix quotes tests for --pathspec-from-file
t: directly test parse_pathspec_file()
t: drop copy&pasted tests for --pathspec-from-file
Makefile | 1 +
t/helper/test-parse-pathspec-file.c | 33 +++++++++
t/helper/test-tool.c | 1 +
t/helper/test-tool.h | 1 +
t/t0067-parse_pathspec_file.sh | 104 ++++++++++++++++++++++++++++
t/t2026-checkout-pathspec-file.sh | 70 +------------------
t/t2072-restore-pathspec-file.sh | 70 +------------------
t/t3704-add-pathspec-file.sh | 70 +------------------
t/t7107-reset-pathspec-file.sh | 79 +++------------------
t/t7526-commit-pathspec-file.sh | 70 +------------------
10 files changed, 156 insertions(+), 343 deletions(-)
create mode 100644 t/helper/test-parse-pathspec-file.c
create mode 100755 t/t0067-parse_pathspec_file.sh
base-commit: 0a76bd7381ec0dbb7c43776eb6d1ac906bca29e6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-503%2FSyntevoAlex%2F%230207(git)_2b_test_parse_directly-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-503/SyntevoAlex/#0207(git)_2b_test_parse_directly-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/503
Range-diff vs v1:
1: ab9519298d = 1: 6193dc7396 t: fix quotes tests for --pathspec-from-file
2: 27383a5b08 ! 2: ab449ac15a t: directly test parse_pathspec_file()
@@ -55,9 +55,8 @@
+ parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file,
+ pathspec_file_nul);
+
-+ for (i = 0; i < pathspec.nr; i++) {
++ for (i = 0; i < pathspec.nr; i++)
+ printf("%s\n", pathspec.items[i].original);
-+ }
+
+ clear_pathspec(&pathspec);
+ return 0;
@@ -99,84 +98,99 @@
+. ./test-lib.sh
+
+test_expect_success 'one item from stdin' '
-+ echo fileA.t | test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ EOF
++
++ echo fileA.t |
++ test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'one item from file' '
-+ echo fileA.t >list &&
-+ test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ EOF
++
++ echo fileA.t >list &&
++ test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'NUL delimiters' '
-+ printf "fileA.t\0fileB.t\0" | test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ fileB.t
+ EOF
++
++ printf "fileA.t\0fileB.t\0" |
++ test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'LF delimiters' '
-+ printf "fileA.t\nfileB.t\n" | test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ fileB.t
+ EOF
++
++ printf "fileA.t\nfileB.t\n" |
++ test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'no trailing delimiter' '
-+ printf "fileA.t\nfileB.t" | test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ fileB.t
+ EOF
++
++ printf "fileA.t\nfileB.t" |
++ test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'CRLF delimiters' '
-+ printf "fileA.t\r\nfileB.t\r\n" | test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-+
+ cat >expect <<-\EOF &&
+ fileA.t
+ fileB.t
+ EOF
++
++ printf "fileA.t\r\nfileB.t\r\n" |
++ test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
++
+ test_cmp expect actual
+'
+
+test_expect_success 'quotes' '
++ cat >expect <<-\EOF &&
++ fileA.t
++ EOF
++
+ # shell takes \\\\101 and spits \\101
+ # printf takes \\101 and spits \101
+ # git takes \101 and spits A
-+ printf "\"file\\\\101.t\"" | test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
++ printf "\"file\\\\101.t\"" |
++ test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
-+ cat >expect <<-\EOF &&
-+ fileA.t
-+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success '--pathspec-file-nul takes quotes literally' '
-+ # shell takes \\\\101 and spits \\101
-+ # printf takes \\101 and spits \101
-+ printf "\"file\\\\101.t\"" | test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
-+
+ cat >expect <<-\EOF &&
+ "file\101.t"
+ EOF
++
++ # shell takes \\\\101 and spits \\101
++ # printf takes \\101 and spits \101
++ printf "\"file\\\\101.t\"" |
++ test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
++
+ test_cmp expect actual
+'
+
3: daef256db3 = 3: 88086cebce t: drop copy&pasted tests for --pathspec-from-file
--
gitgitgadget
next prev parent reply other threads:[~2019-12-30 19:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 17:42 [PATCH 0/3] t: rework tests for --pathspec-from-file Alexandr Miloslavskiy via GitGitGadget
2019-12-30 17:42 ` [PATCH 1/3] t: fix quotes " Alexandr Miloslavskiy via GitGitGadget
2019-12-30 17:42 ` [PATCH 2/3] t: directly test parse_pathspec_file() Alexandr Miloslavskiy via GitGitGadget
2019-12-30 18:52 ` Junio C Hamano
2019-12-30 19:16 ` Alexandr Miloslavskiy
2019-12-30 17:42 ` [PATCH 3/3] t: drop copy&pasted tests for --pathspec-from-file Alexandr Miloslavskiy via GitGitGadget
2019-12-30 19:15 ` Alexandr Miloslavskiy via GitGitGadget [this message]
2019-12-30 19:15 ` [PATCH v2 1/3] t: fix quotes " Alexandr Miloslavskiy via GitGitGadget
2019-12-30 21:55 ` Eric Sunshine
2019-12-31 0:26 ` Jonathan Nieder
2019-12-31 10:01 ` Alexandr Miloslavskiy
2019-12-30 19:15 ` [PATCH v2 2/3] t: directly test parse_pathspec_file() Alexandr Miloslavskiy via GitGitGadget
2019-12-30 19:15 ` [PATCH v2 3/3] t: drop copy&pasted tests for --pathspec-from-file Alexandr Miloslavskiy via GitGitGadget
2019-12-31 9:53 ` [PATCH v3 0/3] t: rework " Alexandr Miloslavskiy via GitGitGadget
2019-12-31 9:53 ` [PATCH v3 1/3] t: fix quotes " Alexandr Miloslavskiy via GitGitGadget
2019-12-31 9:53 ` [PATCH v3 2/3] t: directly test parse_pathspec_file() Alexandr Miloslavskiy via GitGitGadget
2019-12-31 9:53 ` [PATCH v3 3/3] t: drop copy&pasted tests for --pathspec-from-file Alexandr Miloslavskiy via GitGitGadget
2019-12-31 10:15 ` [PATCH v4 0/3] t: rework " Alexandr Miloslavskiy via GitGitGadget
2019-12-31 10:15 ` [PATCH v4 1/3] t: fix quotes " Alexandr Miloslavskiy via GitGitGadget
2019-12-31 10:15 ` [PATCH v4 2/3] t: directly test parse_pathspec_file() Alexandr Miloslavskiy via GitGitGadget
2019-12-31 10:15 ` [PATCH v4 3/3] t: drop copy&pasted tests for --pathspec-from-file Alexandr Miloslavskiy via GitGitGadget
2020-01-07 21:13 ` [PATCH v4 0/3] t: rework " Junio C Hamano
2020-01-08 15:32 ` Alexandr Miloslavskiy
2020-01-08 17:26 ` Junio C Hamano
2020-01-08 17:42 ` Alexandr Miloslavskiy
2020-01-08 18:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.503.v2.git.1577733329.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=alexandr.miloslavskiy@syntevo.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).