git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Chang <ttjtftx@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Jonathan Chang <ttjtftx@gmail.com>,
	Christian Couder <christian.couder@gmail.com>,
	Thomas Gummerer <t.gummerer@gmail.com>, git <git@vger.kernel.org>
Subject: [GSoC][PATCH v2 5/5] t0000-basic: use test_line_count instead of wc -l
Date: Sun, 10 Mar 2019 16:11:06 +0800	[thread overview]
Message-ID: <20190310081106.64239-1-ttjtftx@gmail.com> (raw)
In-Reply-To: <20190310081023.64186-1-ttjtftx@gmail.com>

Signed-off-by: Jonathan Chang <ttjtftx@gmail.com>

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 47666b013e..aa25694b45 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -1136,8 +1136,8 @@ test_expect_success 'git commit-tree omits duplicated parent in a commit' '
 	parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | sort -u) &&
 	test "z$commit0" = "z$parent" &&
 	git show --pretty=raw $commit2 >actual &&
-	numparent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | wc -l) &&
-	test $numparent = 1
+	sed -n -e "s/^parent //p" -e "/^author /q" actual | wc -l >numparent &&
+	test_line_count = 1 numparent
 '
 
 test_expect_success 'update-index D/F conflict' '
@@ -1146,8 +1146,8 @@ test_expect_success 'update-index D/F conflict' '
 	mv tmp path2 &&
 	git update-index --add --replace path2 path0/file2 &&
 	git ls-files path0 >actual &&
-	numpath0=$(wc -l <actual) &&
-	test $numpath0 = 1
+	wc -l <actual >numpath0 &&
+	test_line_count = 1 numpath0
 '
 
 test_expect_success 'very long name in the index handled sanely' '
-- 
2.21.0


  reply	other threads:[~2019-03-10  8:11 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-09 15:45 [GSoC][PATCH] tests: avoid using pipes Jonathan Chang
2019-03-09 16:45 ` Thomas Gummerer
2019-03-10  8:07   ` [GSoC][PATCH v2 1/5] t0000-basic: fix an indentation error Jonathan Chang
2019-03-10  8:08     ` [GSoC][PATCH v2 2/5] t0000-basic: avoid using pipes Jonathan Chang
2019-03-10  8:09       ` [GSoC][PATCH v2 3/5] t0003-attributes: " Jonathan Chang
2019-03-10  8:10         ` [GSoC][PATCH v2 4/5] t0022-crlf-rename: " Jonathan Chang
2019-03-10  8:11           ` Jonathan Chang [this message]
2019-03-10  9:50             ` [GSoC][PATCH v2 5/5] t0000-basic: use test_line_count instead of wc -l Eric Sunshine
2019-03-11 16:10               ` ttjtftx
2019-03-10 10:03           ` [GSoC][PATCH v2 4/5] t0022-crlf-rename: avoid using pipes Eric Sunshine
     [not found]             ` <CAOAu_YJKNjGd3mw7K17ySQJeF4XxC+V00FFEYA7o593riEGN1g@mail.gmail.com>
2019-03-11 15:54               ` Fwd: " ttjtftx
2019-03-10 10:13         ` [GSoC][PATCH v2 3/5] t0003-attributes: " Eric Sunshine
2019-03-15  1:56           ` jonathan chang
2019-03-10 17:59     ` [GSoC][PATCH v2 1/5] t0000-basic: fix an indentation error Thomas Gummerer
2019-03-15  1:55       ` jonathan chang
2019-03-15 12:48         ` Christian Couder
2019-03-10  6:05 ` [GSoC][PATCH] tests: avoid using pipes Christian Couder
2019-03-10  8:27   ` ttjtftx
2019-03-10 15:05     ` Christian Couder
     [not found]       ` <CAOAu_YL8heWLSznRV8pjLkRZBOEth_7CSmftupx+4+SSx5yztw@mail.gmail.com>
2019-03-11 16:45         ` Fwd: " jonathan chang

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=20190310081106.64239-1-ttjtftx@gmail.com \
    --to=ttjtftx@gmail.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=t.gummerer@gmail.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).