Andrew's git / gitweb.git / diff
?
t7800: readlink may not be available
authorArmin Kunaschik <megabreit@googlemail.com>
Tue, 31 May 2016 00:26:12 +0000 (02:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2016 18:41:31 +0000 (11:41 -0700)
The readlink(1) command is not available on all platforms (notably
not on AIX and HP-UX) and can be replaced in this test with the
"workaround"

ls -ld <name> | sed -e 's/.* -> //'

This is no universal readlink replacement but works in the
controlled test environment well enough.

Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7800-difftool.sh patch | blob | history
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index ea35a0241c201ac12c29603a21421199dd097600..cec3eafdfd62548e3318aa1d611955abb9aa3b76 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -423,7 +423,7 @@ write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do
        echo "$f"
-       readlink "$2/$f"
+       ls -ld "$2/$f" | sed -e 's/.* -> //'
 done >actual
 EOF