[PATCH v3 3/4] t6400: use test_line_count_cmd to count # of lines in stdout
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..e5e9e473fe 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 = 5 git ls-files -s &&
+ test_line_count_cmd = 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 = 0 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd = 1 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 = 5 git ls-files -s &&
+ test_line_count_cmd = 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 = 0 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_line_count_cmd = 1 git ls-files -o
fi &&
test_path_is_file letters/file &&
--
2.32.0.278.gd42b80f139
Đoàn Trần Công Danh <congdanhqx@gmail.com>