diff options
| author |  David Aguilar <davvid@gmail.com> | 2017-02-07 01:16:59 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:31:20 -0800 |
| commit | e66adcadfe63508dfd7410c2253116043894d298 (patch) | |
| tree | b4699f4621010029c90f6cca77a66f8005f8d220 | |
| parent | difftool: fix bug when printing usage (diff) | |
| download | tgif-e66adcadfe63508dfd7410c2253116043894d298.tar.xz | |
t7800: simplify basic usage test
Use "test_line_count" instead of "wc -l", use "git -C" instead of a
subshell, and use test_expect_code when calling difftool. Ease
debugging by capturing output into temporary files.
Suggested-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7800-difftool.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 1c81f46cbf..3d728e296d 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -24,16 +24,15 @@ prompt_given () } test_expect_success 'basic usage requires no repo' ' - lines=$(git difftool -h | grep ^usage: | wc -l) && - test "$lines" -eq 1 && + test_expect_code 129 git difftool -h >output && + grep ^usage: output && # create a ceiling directory to prevent Git from finding a repo mkdir -p not/repo && - ceiling="$PWD/not" && - lines=$(cd not/repo && - GIT_CEILING_DIRECTORIES="$ceiling" git difftool -h | - grep ^usage: | wc -l) && - test "$lines" -eq 1 && - rmdir -p not/repo + test_when_finished rm -r not && + test_expect_code 129 \ + env GIT_CEILING_DIRECTORIES="$(pwd)/not" \ + git -C not/repo difftool -h >output && + grep ^usage: output ' # Create a file on master and change it on branch |