summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2010-04-07 10:56:06 +0200
committerJim Meyering <meyering@redhat.com>2010-04-07 11:01:31 +0200
commit55cf264a2bac21ed6b8729bc175df421e35facf4 (patch)
tree277113f9bfcb322981b7cebb41442ce24b6a41be
parenteb7d0cc49110157fe0a7820f39cb052371af2699 (diff)
downloaddiffutils-55cf264a2bac21ed6b8729bc175df421e35facf4.tar.gz
tests: use path_prepend_ consistently; remove unnecessary VERBOSE check
* tests/basic: Likewise. * tests/binary: Likewise. * tests/function-line-vs-leading-space: Likewise. * tests/label-vs-func: Likewise. * tests/stdin: Likewise.
-rwxr-xr-xtests/basic3
-rw-r--r--tests/binary3
-rwxr-xr-xtests/function-line-vs-leading-space3
-rwxr-xr-xtests/label-vs-func3
-rwxr-xr-xtests/stdin3
5 files changed, 5 insertions, 10 deletions
diff --git a/tests/basic b/tests/basic
index 87bb7d8..bfee8bd 100755
--- a/tests/basic
+++ b/tests/basic
@@ -1,9 +1,8 @@
#!/bin/sh
# small examples
-test "$VERBOSE" = yes && set -x
: ${srcdir=.}
-. "$srcdir/init.sh"
+. "$srcdir/init.sh"; path_prepend_ ../src
fail=0
diff --git a/tests/binary b/tests/binary
index 9c31bc6..c66ea04 100644
--- a/tests/binary
+++ b/tests/binary
@@ -1,9 +1,8 @@
#!/bin/sh
# small examples
-test "$VERBOSE" = yes && set -x
: ${srcdir=.}
-. "$srcdir/init.sh"
+. "$srcdir/init.sh"; path_prepend_ ../src
printf 'Binary files - and /dev/null differ\n' > out-exp || fail_ setup
diff --git a/tests/function-line-vs-leading-space b/tests/function-line-vs-leading-space
index 320452c..62fd021 100755
--- a/tests/function-line-vs-leading-space
+++ b/tests/function-line-vs-leading-space
@@ -1,9 +1,8 @@
#!/bin/sh
# Demonstrate how -F RE behavior changed after diff-2.9.
-test "$VERBOSE" = yes && set -x
: ${srcdir=.}
-. "$srcdir/init.sh"
+. "$srcdir/init.sh"; path_prepend_ ../src
cat <<EOF > in || fail_ "failed to create temporary file"
procedure AdaCode is
diff --git a/tests/label-vs-func b/tests/label-vs-func
index c862bed..2026b0a 100755
--- a/tests/label-vs-func
+++ b/tests/label-vs-func
@@ -1,9 +1,8 @@
#!/bin/sh
# Show how diff's -p option can mistakenly match a label: in column 1.
-test "$VERBOSE" = yes && set -x
: ${srcdir=.}
-. "$srcdir/init.sh"
+. "$srcdir/init.sh"; path_prepend_ ../src
fail=0
cat <<EOF > exp || fail=1
diff --git a/tests/stdin b/tests/stdin
index 3c114bd..66ef2bb 100755
--- a/tests/stdin
+++ b/tests/stdin
@@ -1,9 +1,8 @@
#!/bin/sh
# Ensure that "-" means "standard input".
-test "$VERBOSE" = yes && set -x
: ${srcdir=.}
-. "$srcdir/init.sh"
+. "$srcdir/init.sh"; path_prepend_ ../src
fail=0