mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 06:47:52 +01:00
Code Activity

Merge branch 'da/t7800-cleanup'

Browse source 
Test updates.

* da/t7800-cleanup:
  t7800: replace "wc -l" with test_line_count
This commit is contained in:
Junio C Hamano 2017-02-10 12:52:26 -08:00
commit dd19bca827
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
t/t7800-difftool.sh
View file

@ -290,8 +290,8 @@ test_expect_success 'difftool + mergetool config variables' '
test_expect_success 'difftool.<tool>.path' '
test_config difftool.tkdiff.path echo &&
git difftool --tool=tkdiff --no-prompt branch >output &&
lines=$(grep file output | wc -l) &&
test "$lines" -eq 1
grep file output >grep-output &&
test_line_count = 1 grep-output
'
test_expect_success 'difftool --extcmd=cat' '
@ -428,9 +428,12 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
# "sub" must only exist in "right"
# "file" and "file2" must be listed in both "left" and "right"
test "1" = $(grep sub output | wc -l) &&
test "2" = $(grep file"$" output | wc -l) &&
test "2" = $(grep file2 output | wc -l)
grep sub output > sub-output &&
test_line_count = 1 sub-output &&
grep file"$" output >file-output &&
test_line_count = 2 file-output &&
grep file2 output >file2-output &&
test_line_count = 2 file2-output
)
'
@ -440,9 +443,11 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory' '
git difftool --dir-diff $symlinks --extcmd ls v1 >output &&
# "sub" and "file" exist in both v1 and HEAD.
# "file2" is unchanged.
test "2" = $(grep sub output | wc -l) &&
test "2" = $(grep file output | wc -l) &&
test "0" = $(grep file2 output | wc -l)
grep sub output >sub-output &&
test_line_count = 2 sub-output &&
grep file output >file-output &&
test_line_count = 2 file-output &&
! grep file2 output
)
'
@ -452,8 +457,9 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory w/ pathspec' '
git difftool --dir-diff $symlinks --extcmd ls branch -- .>output &&
# "sub" only exists in "right"
# "file" and "file2" must not be listed
test "1" = $(grep sub output | wc -l) &&
test "0" = $(grep file output | wc -l)
grep sub output >sub-output &&
test_line_count = 1 sub-output &&
! grep file output
)
'
@ -463,8 +469,9 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory w/ pathspec' '
git difftool --dir-diff $symlinks --extcmd ls v1 -- .>output &&
# "sub" exists in v1 and HEAD
# "file" is filtered out by the pathspec
test "2" = $(grep sub output | wc -l) &&
test "0" = $(grep file output | wc -l)
grep sub output >sub-output &&
test_line_count = 2 sub-output &&
! grep file output
)
'