[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] vc-list-files tests: convert to use init.sh
From: |
Jim Meyering |
Subject: |
[PATCH] vc-list-files tests: convert to use init.sh |
Date: |
Fri, 23 Apr 2010 11:46:48 +0200 |
FYI, this converts a couple more test scripts to use init.sh:
>From 1b260c90384d91ca9b211670b705ed671aff26c7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 23 Apr 2010 11:38:35 +0200
Subject: [PATCH] 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.
---
ChangeLog | 11 +++++++++++
modules/vc-list-files-tests | 1 +
tests/test-vc-list-files-cvs.sh | 18 +++++-------------
tests/test-vc-list-files-git.sh | 16 ++++------------
4 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3f7a726..dc4aed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-23 Jim Meyering <address@hidden>
+
+ 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 <address@hidden>
* top/maint.mk (sc_prohibit_backup_files): Prohibit checked in
diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests
index c6bc074..9177c4e 100644
--- a/modules/vc-list-files-tests
+++ b/modules/vc-list-files-tests
@@ -1,6 +1,7 @@
Files:
tests/test-vc-list-files-git.sh
tests/test-vc-list-files-cvs.sh
+tests/init.sh
Depends-on:
diff --git a/tests/test-vc-list-files-cvs.sh b/tests/test-vc-list-files-cvs.sh
index 110be03..43a3b3f 100755
--- a/tests/test-vc-list-files-cvs.sh
+++ b/tests/test-vc-list-files-cvs.sh
@@ -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
-
-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-cvs
repo=`pwd`/$tmpdir/repo
fail=0
@@ -46,7 +38,7 @@ for i in with-cvsu without; do
# 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 @@ for i in with-cvsu without; do
test $ok = 0 && fail=1
done
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh
index 56a9a5b..4757625 100755
--- a/tests/test-vc-list-files-git.sh
+++ b/tests/test-vc-list-files-git.sh
@@ -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 @@ 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 "address@hidden" &&
@@ -47,4 +39,4 @@ mkdir $tmpdir && cd $tmpdir &&
compare expected actual &&
fail=0
-(exit $fail); exit $fail
+Exit $fail
--
1.7.1.rc2.340.g38e7f
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] vc-list-files tests: convert to use init.sh,
Jim Meyering <=