diff options
Diffstat (limited to 'gltests/test-vc-list-files-git.sh')
| -rwxr-xr-x | gltests/test-vc-list-files-git.sh | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gltests/test-vc-list-files-git.sh b/gltests/test-vc-list-files-git.sh index f1627e7..523b2a9 100755 --- a/gltests/test-vc-list-files-git.sh +++ b/gltests/test-vc-list-files-git.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests for vc-list-files -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008-2011 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify @@ -16,28 +16,22 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then - compare() { diff -u "$@"; } -elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then - compare() { cmp -s "$@"; } -else - compare() { cmp "$@"; } -fi +: ${srcdir=.} +. "$srcdir/init.sh"; path_prepend_ "$abs_aux_dir" . tmpdir=vc-git-$$ -trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0 -trap '(exit $?); exit $?' 1 2 13 15 +GIT_DIR= GIT_WORK_TREE=; unset GIT_DIR GIT_WORK_TREE fail=1 mkdir $tmpdir && cd $tmpdir && # without git, skip the test # The double use of 'exit' is needed for the reference to $? inside the trap. { ( git init -q ) > /dev/null 2>&1 \ - || { echo "Skipping test: git not found in PATH"; (exit 77); exit 77; }; } && + || skip_ "git not found in PATH"; } && mkdir d && touch d/a b c && - git config user.email "you@example.com" - git config user.name "Your Name" + git config user.email "you@example.com" && + git config user.name "Your Name" && git add . > /dev/null && git commit -q -a -m log && printf '%s\n' b c d/a > expected && @@ -45,4 +39,4 @@ mkdir $tmpdir && cd $tmpdir && compare expected actual && fail=0 -(exit $fail); exit $fail +Exit $fail |