Browse Source

t7800: move '--symlinks' specific test to the end

This will group the tests more logically when we introduce a helper to
run most --dir-diff tests with both --symlinks and --no-symlinks.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
John Keeping 12 years ago committed by Junio C Hamano
parent
commit
bf341b902e
  1. 30
      t/t7800-difftool.sh

30
t/t7800-difftool.sh

@ -340,6 +340,21 @@ test_expect_success PERL 'difftool --dir-diff' ' @@ -340,6 +340,21 @@ test_expect_success PERL 'difftool --dir-diff' '
stdin_contains file <output
'

test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
git difftool --dir-diff --prompt --extcmd ls branch >output &&
stdin_contains sub <output &&
stdin_contains file <output
'

test_expect_success PERL 'difftool --dir-diff from subdirectory' '
(
cd sub &&
git difftool --dir-diff --extcmd ls branch >output &&
stdin_contains sub <output &&
stdin_contains file <output
)
'

write_script .git/CHECK_SYMLINKS <<\EOF
for f in file file2 sub/sub
do
@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage @@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage
test_cmp actual expect
'

test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
git difftool --dir-diff --prompt --extcmd ls branch >output &&
stdin_contains sub <output &&
stdin_contains file <output
'

test_expect_success PERL 'difftool --dir-diff from subdirectory' '
(
cd sub &&
git difftool --dir-diff --extcmd ls branch >output &&
stdin_contains sub <output &&
stdin_contains file <output
)
'

test_done

Loading…
Cancel
Save