| commit | e01afdb74b395e63a6ee8feb8cb3a6ee470e2085 | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 29 Mar 2013 11:28:36 +0000 (29 11:28 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Mar 2013 22:16:40 +0000 (29 15:16 -0700) | ||
| tree | cce143c60358a4ad78b15e10bf8f66eaf7bf381a | treesnapshot (tar.gz zip) |
| parent | 3caf5a93d8ccbffaccfbae3fe814325682cc95f4 | commitdiff |
t7800: run --dir-diff tests with and without symlinks
Currently the difftool --dir-diff tests may or may not use symlinks
depending on the operating system on which they are run. In one case
this has caused a test failure to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.
Rewrite these tests so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Currently the difftool --dir-diff tests may or may not use symlinks
depending on the operating system on which they are run. In one case
this has caused a test failure to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.
Rewrite these tests so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7800-difftool.sh | diffblobblamehistory |