I'm slightly leery of adding a test for a non-essential tool like vc-list-files, since everyone who uses the module will now pull in this test, and possibly get a test failure. Such a failure doesn't really matter in general -- most people don't run "make syntax-check" or "make distcheck" -- so a test failure here is most definitely no cause for alarm and no reason not to install the package.
Of course, gnulib-using packages that want to avoid a test like this can easily just exclude it. Opinions? >From 5b0a24aed74f24b405af7fde23d4a803254067f6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[EMAIL PROTECTED]> Date: Wed, 30 Apr 2008 15:01:23 +0200 Subject: [PATCH] add tests for vc-list-files * modules/vc-list-files-tests: New module. * tests/test-vc-list-files-cvs.sh: New file. * tests/test-vc-list-files-git.sh: New file. Signed-off-by: Jim Meyering <[EMAIL PROTECTED]> --- modules/vc-list-files-tests | 12 +++++++ tests/test-vc-list-files-cvs.sh | 63 +++++++++++++++++++++++++++++++++++++++ tests/test-vc-list-files-git.sh | 47 +++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 modules/vc-list-files-tests create mode 100755 tests/test-vc-list-files-cvs.sh create mode 100755 tests/test-vc-list-files-git.sh diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests new file mode 100644 index 0000000..d0a4234 --- /dev/null +++ b/modules/vc-list-files-tests @@ -0,0 +1,12 @@ +Files: +tests/test-vc-list-files-git.sh +tests/test-vc-list-files-cvs.sh + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-vc-list-files-git.sh +TESTS += test-vc-list-files-cvs.sh +TESTS_ENVIRONMENT += abs_top_srcdir='$(abs_top_srcdir)' diff --git a/tests/test-vc-list-files-cvs.sh b/tests/test-vc-list-files-cvs.sh new file mode 100755 index 0000000..91bdeac --- /dev/null +++ b/tests/test-vc-list-files-cvs.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# Unit tests for vc-list-files +# Copyright (C) 2008 Free Software Foundation, Inc. +# This file is part of the GNUlib Library. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +PATH="$abs_top_srcdir/build-aux":$PATH +export PATH + +tmpdir=vc-cvs-$$ +trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +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 + +repo=`pwd`/$tmpdir/repo + +fail=0 +for i in with-cvsu without; do + # On the first iteration, test using cvsu, if it's in your path. + # On the second iteration, ensure that cvsu fails, so we'll + # exercise the awk-using code. + if test $i = without; then + printf '%s\n' '#!/bin/sh' 'exit 1' > cvsu + chmod a+x cvsu + PATH=`pwd`:$PATH + export PATH + fi + ok=0 + mkdir $tmpdir && cd $tmpdir && + # without cvs, skip the test + { cvs -Q -d "$repo" init || exit 77; } && + mkdir w && cd w && + mkdir d && + touch d/a b c && + cvs -Q -d "$repo" import -m imp m M M0 && + cvs -Q -d "$repo" co m && cd m && + printf '%s\n' b c d/a > expected && + vc-list-files | sort > actual && + compare expected actual && + ok=1 + test $ok = 0 && fail=1 +done + +(exit $fail); exit $fail diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh new file mode 100755 index 0000000..7fffc83 --- /dev/null +++ b/tests/test-vc-list-files-git.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# Unit tests for vc-list-files +# Copyright (C) 2008 Free Software Foundation, Inc. +# This file is part of the GNUlib Library. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +PATH="$abs_top_srcdir/build-aux":$PATH +export PATH + +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-git-$$ +trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +fail=1 +mkdir $tmpdir && cd $tmpdir && + # without git, skip the test + { git init -q || exit 77; } && + mkdir d && + touch d/a b c && + git add . > /dev/null && + git commit -q -a -m log && + printf '%s\n' b c d/a > expected && + vc-list-files > actual && + compare expected actual && + fail=0 + +(exit $fail); exit $fail -- 1.5.5.1.100.g9a8d
