diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-02-20 11:33:51 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-03-26 14:20:28 +0100 |
| commit | 2876ed918f00810f399dcb626df61feea389bfac (patch) | |
| tree | 1dcb5f6dcf3e2e5a0c377976ed5087ec73e81d52 | |
| parent | 02e3376350b5ddf29ba1e697ec8b71cf5a9f8344 (diff) | |
| download | patch-2876ed918f00810f399dcb626df61feea389bfac.tar.gz | |
maint: avoid non-portable use of test -a
With these changes, "make sc_prohibit_test_minus_ao" almost passes.
Uses of "test -o" remain.
Note: unchecked uses of test -ot/-nt also remain.
* tests/empty-files: Use "test C1 && test C2", not "test C1 -a C2"
* tests/merge: Likewise.
* tests/symlinks: Likewise.
* tests/test-lib.sh: Likewise.
| -rw-r--r-- | tests/empty-files | 4 | ||||
| -rw-r--r-- | tests/merge | 2 | ||||
| -rw-r--r-- | tests/symlinks | 2 | ||||
| -rw-r--r-- | tests/test-lib.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/empty-files b/tests/empty-files index 6ac01be..8ca1e13 100644 --- a/tests/empty-files +++ b/tests/empty-files @@ -26,7 +26,7 @@ check 'patch < create-empty.diff || echo "Status: $?"' <<EOF patching file f EOF -ncheck 'test -e f -a ! -s f' +ncheck 'test -e f && test ! -s f' # -------------------------------------------------------------- # Empty out a file @@ -46,7 +46,7 @@ check 'patch < empty-out.diff || echo "Status: $?"' <<EOF patching file f EOF -ncheck 'test -e f -a ! -s f' +ncheck 'test -e f && test ! -s f' # -------------------------------------------------------------- # Empty out a file and delete it with -E diff --git a/tests/merge b/tests/merge index 00b45a4..5aee809 100644 --- a/tests/merge +++ b/tests/merge @@ -27,7 +27,7 @@ x2() { body=`seq 1 $1` shift echo "$body" > a - while test $# -gt 0 -a "$1" != -- ; do + while test $# -gt 0 && test "$1" != -- ; do echo "$1" shift done > a.sed diff --git a/tests/symlinks b/tests/symlinks index f7dea76..3b7f0e2 100644 --- a/tests/symlinks +++ b/tests/symlinks @@ -147,7 +147,7 @@ check 'patch -p1 --backup < create-symlink.diff || echo "Status: $?"' <<EOF patching symbolic link symlink EOF -ncheck 'test -f symlink.orig -a ! -s symlink.orig' +ncheck 'test -f symlink.orig && test ! -s symlink.orig' # The backup file of a modified symlink is the old symlink. diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 2dbfbcd..b3ce900 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -104,7 +104,7 @@ cleanup() { checks_failed=`expr $checks_failed` checks_total=`expr $checks_succeeded + $checks_failed` if test $checks_total -gt 0 ; then - if test $checks_failed -gt 0 -a $status -eq 0 ; then + if test $checks_failed -gt 0 && test $status -eq 0 ; then status=1 fi echo "$checks_total tests ($checks_succeeded passed," \ |