diff options
| author | Quentin Casasnovas <quentin.casasnovas@oracle.com> | 2015-01-27 13:31:14 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@gnu.org> | 2015-01-31 22:14:01 +0100 |
| commit | c80b1a06a9209e6e7f1b624b9058e2b838c67797 (patch) | |
| tree | 5c0fe4fc79e5e8f6fc5473c23486623b90ab3a4e | |
| parent | 8d621e88193c6a5a80081104d9ae4434cff78722 (diff) | |
| download | patch-c80b1a06a9209e6e7f1b624b9058e2b838c67797.tar.gz | |
test-lib.sh: factorize require_* functions
Since the code is identical when just checking if a utility is present on
the system or not, we can factorize it.
Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
36 files changed, 54 insertions, 58 deletions
diff --git a/tests/asymmetric-hunks b/tests/asymmetric-hunks index 6929c4a..d6979d9 100644 --- a/tests/asymmetric-hunks +++ b/tests/asymmetric-hunks @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/backup-prefix-suffix b/tests/backup-prefix-suffix index a51142c..e37d602 100644 --- a/tests/backup-prefix-suffix +++ b/tests/backup-prefix-suffix @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/bad-usage b/tests/bad-usage index 022eeda..551553a 100644 --- a/tests/bad-usage +++ b/tests/bad-usage @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/concat-git-diff b/tests/concat-git-diff index c78da53..f8bf911 100644 --- a/tests/concat-git-diff +++ b/tests/concat-git-diff @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/copy-rename b/tests/copy-rename index 40f53d1..fd5fd64 100644 --- a/tests/copy-rename +++ b/tests/copy-rename @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/corrupt-reject-files b/tests/corrupt-reject-files index 17215aa..ad001f8 100644 --- a/tests/corrupt-reject-files +++ b/tests/corrupt-reject-files @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/create-delete b/tests/create-delete index 404d99e..2ec80df 100644 --- a/tests/create-delete +++ b/tests/create-delete @@ -6,8 +6,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/criss-cross b/tests/criss-cross index 7b5a706..5e7b611 100644 --- a/tests/criss-cross +++ b/tests/criss-cross @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/crlf-handling b/tests/crlf-handling index b704dc8..239149c 100644 --- a/tests/crlf-handling +++ b/tests/crlf-handling @@ -8,8 +8,8 @@ . $srcdir/test-lib.sh -require_gnu_diff -require_sed +require gnu_diff +require sed use_local_patch use_tmpdir diff --git a/tests/dash-o-append b/tests/dash-o-append index 1633699..c6c2d4a 100644 --- a/tests/dash-o-append +++ b/tests/dash-o-append @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/deep-directories b/tests/deep-directories index 89e66be..d6a41a6 100755 --- a/tests/deep-directories +++ b/tests/deep-directories @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/empty-files b/tests/empty-files index 66319ec..6c8708f 100644 --- a/tests/empty-files +++ b/tests/empty-files @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir umask 022 @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/file-modes b/tests/file-modes index e71c209..b615099 100644 --- a/tests/file-modes +++ b/tests/file-modes @@ -8,8 +8,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/filename-choice b/tests/filename-choice index 88fc805..1d011bc 100644 --- a/tests/filename-choice +++ b/tests/filename-choice @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/git-binary-diff b/tests/git-binary-diff index 2b3f3a2..21c5df1 100644 --- a/tests/git-binary-diff +++ b/tests/git-binary-diff @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/global-reject-files b/tests/global-reject-files index 65c57dd..6426d03 100644 --- a/tests/global-reject-files +++ b/tests/global-reject-files @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/inname b/tests/inname index 080a0cc..b5ec9f3 100644 --- a/tests/inname +++ b/tests/inname @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/line-numbers b/tests/line-numbers index fc83042..e9b0cfe 100644 --- a/tests/line-numbers +++ b/tests/line-numbers @@ -6,8 +6,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/mangled-numbers-abort b/tests/mangled-numbers-abort index 8826ae9..d05c171 100644 --- a/tests/mangled-numbers-abort +++ b/tests/mangled-numbers-abort @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/merge b/tests/merge index 8e01edc..22d787b 100644 --- a/tests/merge +++ b/tests/merge @@ -8,9 +8,9 @@ . $srcdir/test-lib.sh -require_cat -require_gnu_diff -require_sed +require cat +require gnu_diff +require sed use_local_patch use_tmpdir diff --git a/tests/mixed-patch-types b/tests/mixed-patch-types index da17c75..2465c0b 100644 --- a/tests/mixed-patch-types +++ b/tests/mixed-patch-types @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir umask 022 diff --git a/tests/munged-context-format b/tests/munged-context-format index 3cd166c..50c95c8 100644 --- a/tests/munged-context-format +++ b/tests/munged-context-format @@ -8,8 +8,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/need-filename b/tests/need-filename index 3748064..8b92848 100644 --- a/tests/need-filename +++ b/tests/need-filename @@ -8,8 +8,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/no-newline-triggers-assert b/tests/no-newline-triggers-assert index 7c2e7eb..855ba70 100644 --- a/tests/no-newline-triggers-assert +++ b/tests/no-newline-triggers-assert @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/preserve-c-function-names b/tests/preserve-c-function-names index 813360e..789fa61 100644 --- a/tests/preserve-c-function-names +++ b/tests/preserve-c-function-names @@ -8,8 +8,8 @@ . $srcdir/test-lib.sh -require_cat -require_gnu_diff +require cat +require gnu_diff use_local_patch use_tmpdir diff --git a/tests/preserve-mode-and-timestamp b/tests/preserve-mode-and-timestamp index 170aff5..18c3c91 100644 --- a/tests/preserve-mode-and-timestamp +++ b/tests/preserve-mode-and-timestamp @@ -6,8 +6,8 @@ . $srcdir/test-lib.sh -require_cat -require_sed +require cat +require sed use_local_patch use_tmpdir diff --git a/tests/quoted-filenames b/tests/quoted-filenames index 5fb9f12..08f312f 100644 --- a/tests/quoted-filenames +++ b/tests/quoted-filenames @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/read-only-files b/tests/read-only-files index 918b97a..bcc11a4 100644 --- a/tests/read-only-files +++ b/tests/read-only-files @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/reject-format b/tests/reject-format index 0b02af6..3c533c6 100644 --- a/tests/reject-format +++ b/tests/reject-format @@ -8,9 +8,9 @@ . $srcdir/test-lib.sh -require_cat -require_sed -require_gnu_diff +require cat +require sed +require gnu_diff use_local_patch use_tmpdir diff --git a/tests/remember-backup-files b/tests/remember-backup-files index b544329..7ca0e86 100644 --- a/tests/remember-backup-files +++ b/tests/remember-backup-files @@ -9,7 +9,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/remember-reject-files b/tests/remember-reject-files index 93b6413..78c6335 100644 --- a/tests/remember-reject-files +++ b/tests/remember-reject-files @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/remove-directories b/tests/remove-directories index 6acdc49..07112eb 100644 --- a/tests/remove-directories +++ b/tests/remove-directories @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/symlinks b/tests/symlinks index 8bb83ed..36fbb1e 100644 --- a/tests/symlinks +++ b/tests/symlinks @@ -8,7 +8,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 051f1a0..be0d7e3 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -7,13 +7,6 @@ # FIXME: Requires a version of diff that understands "-u". -require_cat() { - if ! type cat > /dev/null 2> /dev/null; then - echo "This test requires the cat utility" >&2 - exit 77 - fi -} - require_gnu_diff() { case "`diff --version 2> /dev/null`" in *GNU*) @@ -24,9 +17,12 @@ require_gnu_diff() { esac } -require_sed() { - if ! type sed > /dev/null 2> /dev/null; then - echo "This test requires the sed utility" >&2 +require() { + utility="$1" + if type require_${utility} > /dev/null 2> /dev/null; then + require_${utility} + elif ! type "${utility}" > /dev/null 2> /dev/null; then + echo "This test requires the ${utility} utility" >&2 exit 77 fi } @@ -163,7 +159,7 @@ if ! type seq > /dev/null 2> /dev/null; then )} fi -require_cat +require cat clean_env checks_succeeded=0 diff --git a/tests/unmodified-files b/tests/unmodified-files index a9e00c6..fd5eee6 100644 --- a/tests/unmodified-files +++ b/tests/unmodified-files @@ -6,7 +6,7 @@ . $srcdir/test-lib.sh -require_cat +require cat use_local_patch use_tmpdir |