Mercurial > gnulib
changeset 32946:1ea7b094e1f7
vc-list-files tests: convert to use init.sh
* tests/test-vc-list-files-cvs.sh: Invoke "$srcdir/init.sh" and
path_prepend_.
Use Exit, not exit.
Use skip_ rather than open coding it.
Remove trap set-up and compare definitions.
* tests/test-vc-list-files-git.sh: Likewise.
* modules/vc-list-files-tests (Files): Add tests/init.sh.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Fri, 23 Apr 2010 11:38:35 +0200 |
| parents | fa5515d37988 |
| children | 824465b1a2f8 |
| files | ChangeLog modules/vc-list-files-tests tests/test-vc-list-files-cvs.sh tests/test-vc-list-files-git.sh |
| diffstat | 4 files changed, 21 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 22 09:25:24 2010 -0700 +++ b/ChangeLog Fri Apr 23 11:38:35 2010 +0200 @@ -1,3 +1,14 @@ +2010-04-23 Jim Meyering <meyering@redhat.com> + + vc-list-files tests: convert to use init.sh + * tests/test-vc-list-files-cvs.sh: Invoke "$srcdir/init.sh" and + path_prepend_. + Use Exit, not exit. + Use skip_ rather than open coding it. + Remove trap set-up and compare definitions. + * tests/test-vc-list-files-git.sh: Likewise. + * modules/vc-list-files-tests (Files): Add tests/init.sh. + 2010-04-22 Simon Josefsson <simon@josefsson.org> * top/maint.mk (sc_prohibit_backup_files): Prohibit checked in
--- a/modules/vc-list-files-tests Thu Apr 22 09:25:24 2010 -0700 +++ b/modules/vc-list-files-tests Fri Apr 23 11:38:35 2010 +0200 @@ -1,6 +1,7 @@ Files: tests/test-vc-list-files-git.sh tests/test-vc-list-files-cvs.sh +tests/init.sh Depends-on:
--- a/tests/test-vc-list-files-cvs.sh Thu Apr 22 09:25:24 2010 -0700 +++ b/tests/test-vc-list-files-cvs.sh Fri Apr 23 11:38:35 2010 +0200 @@ -16,18 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. */ -tmpdir=vc-cvs-$$ -trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0 -trap '(exit $?); exit $?' 1 2 13 15 +: ${srcdir=.} +. "$srcdir/init.sh"; path_prepend_ . -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 - +tmpdir=vc-cvs repo=`pwd`/$tmpdir/repo fail=0 @@ -46,7 +38,7 @@ # without cvs, skip the test # The double use of 'exit' is needed for the reference to $? inside the trap. { ( cvs -Q -d "$repo" init ) > /dev/null 2>&1 \ - || { echo "Skipping test: cvs not found in PATH"; (exit 77); exit 77; }; } && + || skip_ "cvs not found in PATH"; } && mkdir w && cd w && mkdir d && touch d/a b c && @@ -59,4 +51,4 @@ test $ok = 0 && fail=1 done -(exit $fail); exit $fail +Exit $fail
--- a/tests/test-vc-list-files-git.sh Thu Apr 22 09:25:24 2010 -0700 +++ b/tests/test-vc-list-files-git.sh Fri Apr 23 11:38:35 2010 +0200 @@ -16,18 +16,10 @@ # 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_ . 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 @@ -35,7 +27,7 @@ # 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" && @@ -47,4 +39,4 @@ compare expected actual && fail=0 -(exit $fail); exit $fail +Exit $fail