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 2/5] t0000-basic: avoid using pipes Date: Sun, 10 Mar 2019 16:08:41 +0800 [thread overview] Message-ID: <20190310080841.64082-1-ttjtftx@gmail.com> (raw) In-Reply-To: <20190310080739.63984-1-ttjtftx@gmail.com> The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Jonathan Chang <ttjtftx@gmail.com> diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 53821f5817..47666b013e 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -1118,27 +1118,25 @@ P=$(test_oid root) test_expect_success 'git commit-tree records the correct tree in a commit' ' commit0=$(echo NO | git commit-tree $P) && - tree=$(git show --pretty=raw $commit0 | - sed -n -e "s/^tree //p" -e "/^author /q") && + git show --pretty=raw $commit0 >actual && + tree=$(sed -n -e "s/^tree //p" -e "/^author /q" actual) && test "z$tree" = "z$P" ' test_expect_success 'git commit-tree records the correct parent in a commit' ' commit1=$(echo NO | git commit-tree $P -p $commit0) && - parent=$(git show --pretty=raw $commit1 | - sed -n -e "s/^parent //p" -e "/^author /q") && + git show --pretty=raw $commit1 >actual && + parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual) && test "z$commit0" = "z$parent" ' test_expect_success 'git commit-tree omits duplicated parent in a commit' ' commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) && - parent=$(git show --pretty=raw $commit2 | - sed -n -e "s/^parent //p" -e "/^author /q" | - sort -u) && + git show --pretty=raw $commit2 >actual && + parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | sort -u) && test "z$commit0" = "z$parent" && - numparent=$(git show --pretty=raw $commit2 | - sed -n -e "s/^parent //p" -e "/^author /q" | - wc -l) && + git show --pretty=raw $commit2 >actual && + numparent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | wc -l) && test $numparent = 1 ' @@ -1147,7 +1145,8 @@ test_expect_success 'update-index D/F conflict' ' mv path2 path0 && mv tmp path2 && git update-index --add --replace path2 path0/file2 && - numpath0=$(git ls-files path0 | wc -l) && + git ls-files path0 >actual && + numpath0=$(wc -l <actual) && test $numpath0 = 1 ' @@ -1162,12 +1161,13 @@ test_expect_success 'very long name in the index handled sanely' ' >path4 && git update-index --add path4 && ( - git ls-files -s path4 | - sed -e "s/ .*/ /" | + git ls-files -s path4 >actual && + sed -e "s/ .*/ /" actual | tr -d "\012" && echo "$a" ) | git update-index --index-info && - len=$(git ls-files "a*" | wc -c) && + git ls-files "a*" >actual && + len=$(wc -c <actual) && test $len = 4098 ' -- 2.21.0
next prev parent reply other threads:[~2019-03-10 8:08 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-09 15:45 [GSoC][PATCH] tests: " 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 ` Jonathan Chang [this message] 2019-03-10 8:09 ` [GSoC][PATCH v2 3/5] t0003-attributes: avoid using pipes Jonathan Chang 2019-03-10 8:10 ` [GSoC][PATCH v2 4/5] t0022-crlf-rename: " Jonathan Chang 2019-03-10 8:11 ` [GSoC][PATCH v2 5/5] t0000-basic: use test_line_count instead of wc -l Jonathan Chang 2019-03-10 9:50 ` 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=20190310080841.64082-1-ttjtftx@gmail.com \ --to=ttjtftx@gmail.com \ --cc=christian.couder@gmail.com \ --cc=git@vger.kernel.org \ --cc=t.gummerer@gmail.com \ --subject='Re: [GSoC][PATCH v2 2/5] t0000-basic: avoid using pipes' \ /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
Code repositories for project(s) associated with this 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).