From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 3/4] t6400: use test_line_count_cmd to count # of lines in stdout
Date: Sat, 12 Jun 2021 11:27:54 +0700 [thread overview]
Message-ID: <20210612042755.28342-4-congdanhqx@gmail.com> (raw)
In-Reply-To: <20210612042755.28342-1-congdanhqx@gmail.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
t/t6400-merge-df.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh
index 38700d29b5..9d7b9354c5 100755
--- a/t/t6400-merge-df.sh
+++ b/t/t6400-merge-df.sh
@@ -82,13 +82,13 @@ test_expect_success 'modify/delete + directory/file conflict' '
git checkout delete^0 &&
test_must_fail git merge modify &&
- test 5 -eq $(git ls-files -s | wc -l) &&
- test 4 -eq $(git ls-files -u | wc -l) &&
+ test_line_count_cmd --out = 5 git ls-files -s &&
+ test_line_count_cmd --out = 4 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 0 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd --out = 2 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd --out = 3 git ls-files -o
fi &&
test_path_is_file letters/file &&
@@ -103,13 +103,13 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
test_must_fail git merge delete &&
- test 5 -eq $(git ls-files -s | wc -l) &&
- test 4 -eq $(git ls-files -u | wc -l) &&
+ test_line_count_cmd --out = 5 git ls-files -s &&
+ test_line_count_cmd --out = 4 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 0 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd --out = 2 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd --out = 3 git ls-files -o
fi &&
test_path_is_file letters/file &&
--
2.32.0.278.gd42b80f139
next prev parent reply other threads:[~2021-06-12 4:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 4:27 [PATCH 0/4] t: new helper test_line_count_cmd Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 1/4] test-lib-functions: introduce test_line_count_cmd Đoàn Trần Công Danh
2021-06-13 3:10 ` Eric Sunshine
2021-06-13 7:36 ` Đoàn Trần Công Danh
2021-06-13 13:28 ` Ævar Arnfjörð Bjarmason
2021-06-13 16:37 ` Đoàn Trần Công Danh
2021-06-13 18:18 ` Phillip Wood
2021-06-13 21:42 ` Felipe Contreras
2021-06-13 23:43 ` Eric Sunshine
2021-06-14 2:56 ` Junio C Hamano
2021-06-24 23:19 ` Ævar Arnfjörð Bjarmason
2021-06-13 13:36 ` Ævar Arnfjörð Bjarmason
2021-06-14 3:01 ` Junio C Hamano
2021-06-15 15:40 ` Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 2/4] t6402: use find(1) builtin to filter instead of grep Đoàn Trần Công Danh
2021-06-12 4:27 ` Đoàn Trần Công Danh [this message]
2021-06-12 4:33 ` [PATCH 3/4] t6400: use test_line_count_cmd to count # of lines in stdout Bagas Sanjaya
2021-06-13 7:39 ` Đoàn Trần Công Danh
2021-06-13 3:39 ` Eric Sunshine
2021-06-13 7:42 ` Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 4/4] t6402: " Đoàn Trần Công Danh
2021-06-13 3:43 ` Eric Sunshine
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210612042755.28342-4-congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).