From 10d190b8b6289f8a4b4818bd03b8f3a5dc87fd14 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 12 Sep 2007 18:14:36 +0200 Subject: Adapt tests/readlink/ to use test-lib.sh. --- tests/readlink/can-m | 183 ++++++++++++++++++++++----------------------------- 1 file changed, 80 insertions(+), 103 deletions(-) (limited to 'tests/readlink/can-m') diff --git a/tests/readlink/can-m b/tests/readlink/can-m index 8465f9f04..bc5bafec3 100755 --- a/tests/readlink/can-m +++ b/tests/readlink/can-m @@ -21,150 +21,127 @@ if test "$VERBOSE" = yes; then readlink --version fi -pwd=`pwd` -t0=`echo "$0" |sed 's,.*/,,'`.tmp; tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 -trap 'status=$?; (exit $status); exit $status' 1 2 13 15 +. $srcdir/../test-lib.sh -fail=1 -while :; do - bindir=`cd ../../src && pwd`|| break - my_pwd=`"$bindir/pwd"` || break +pwd=`pwd` +my_pwd=$("$abs_top_builddir/src/pwd") +tmp=d - mkdir -p $tmp || break - cd $tmp || break +fail=0 +mkdir $tmp || framework_failure +cd $tmp || framework_failure - mkdir subdir removed || break - touch regfile || break +mkdir subdir removed || framework_failure +touch regfile || framework_failure - ln -s regfile link1 || break - ln -s subdir link2 || break - ln -s missing link3 || break - ln -s subdir/missing link4 || break +ln -s regfile link1 || framework_failure +ln -s subdir link2 || framework_failure +ln -s missing link3 || framework_failure +ln -s subdir/missing link4 || framework_failure - fail=0 - break -done +cd "$pwd/$tmp/removed" || framework_failure -if test $fail = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 +fail=0 +# Skip this test if the system doesn't let you remove the working directory. +if rmdir ../removed 2>/dev/null; then + v=`readlink -e .` && fail=1 + test -z "$v" || fail=1 fi -fail=1 -while :; do - cd "$pwd/$tmp/removed" || break - - # Skip this test if the system doesn't let you remove the working directory. - if rmdir ../removed 2>/dev/null; then - v=`readlink -m .` && break - test -z "$v" || break - fi - - cd "$pwd/$tmp" || break - - fail=0 - break -done - -if test $fail = 1; then - (exit $fail); exit $fail -fi +cd "$pwd/$tmp" || fail=1 for p in "" "$pwd/$tmp/"; do - fail=1 - v=`readlink -m "${p}regfile"` || break - test "$v" = "$my_pwd/$tmp/regfile" || break + v=`readlink -m "${p}regfile"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - v=`readlink -m "${p}./regfile/"` || break - test "$v" = "$my_pwd/$tmp/regfile" || break + v=`readlink -m "${p}./regfile/"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - v=`readlink -m "${p}regfile/more"` || break - test "$v" = "$my_pwd/$tmp/regfile/more" || break + v=`readlink -m "${p}regfile/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - v=`readlink -m "${p}./regfile/more/"` || break - test "$v" = "$my_pwd/$tmp/regfile/more" || break + v=`readlink -m "${p}./regfile/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - v=`readlink -m "${p}subdir"` || break - test "$v" = "$my_pwd/$tmp/subdir" || break + v=`readlink -m "${p}subdir"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=`readlink -m "${p}./subdir/"` || break - test "$v" = "$my_pwd/$tmp/subdir" || break + v=`readlink -m "${p}./subdir/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=`readlink -m "${p}subdir/more"` || break - test "$v" = "$my_pwd/$tmp/subdir/more" || break + v=`readlink -m "${p}subdir/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - v=`readlink -m "${p}./subdir/more/"` || break - test "$v" = "$my_pwd/$tmp/subdir/more" || break + v=`readlink -m "${p}./subdir/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - v=`readlink -m "${p}missing"` || break - test "$v" = "$my_pwd/$tmp/missing" || break + v=`readlink -m "${p}missing"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=`readlink -m "${p}./missing/"` || break - test "$v" = "$my_pwd/$tmp/missing" || break + v=`readlink -m "${p}./missing/"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=`readlink -m "${p}missing/more"` || break - test "$v" = "$my_pwd/$tmp/missing/more" || break + v=`readlink -m "${p}missing/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - v=`readlink -m "${p}./missing/more/"` || break - test "$v" = "$my_pwd/$tmp/missing/more" || break + v=`readlink -m "${p}./missing/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - v=`readlink -m "${p}link1"` || break - test "$v" = "$my_pwd/$tmp/regfile" || break + v=`readlink -m "${p}link1"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - v=`readlink -m "${p}./link1/"` || break - test "$v" = "$my_pwd/$tmp/regfile" || break + v=`readlink -m "${p}./link1/"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile" || fail=1 - v=`readlink -m "${p}link1/more"` || break - test "$v" = "$my_pwd/$tmp/regfile/more" || break + v=`readlink -m "${p}link1/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - v=`readlink -m "${p}./link1/more/"` || break - test "$v" = "$my_pwd/$tmp/regfile/more" || break + v=`readlink -m "${p}./link1/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1 - v=`readlink -m "${p}link2"` || break - test "$v" = "$my_pwd/$tmp/subdir" || break + v=`readlink -m "${p}link2"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=`readlink -m "${p}./link2/"` || break - test "$v" = "$my_pwd/$tmp/subdir" || break + v=`readlink -m "${p}./link2/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=`readlink -m "${p}link2/more"` || break - test "$v" = "$my_pwd/$tmp/subdir/more" || break + v=`readlink -m "${p}link2/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - v=`readlink -m "${p}./link2/more/"` || break - test "$v" = "$my_pwd/$tmp/subdir/more" || break + v=`readlink -m "${p}./link2/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1 - v=`readlink -m "${p}link2/more/more2"` || break - test "$v" = "$my_pwd/$tmp/subdir/more/more2" || break + v=`readlink -m "${p}link2/more/more2"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 - v=`readlink -m "${p}./link2/more/more2/"` || break - test "$v" = "$my_pwd/$tmp/subdir/more/more2" || break + v=`readlink -m "${p}./link2/more/more2/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1 - v=`readlink -m "${p}link3"` || break - test "$v" = "$my_pwd/$tmp/missing" || break + v=`readlink -m "${p}link3"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=`readlink -m "${p}./link3/"` || break - test "$v" = "$my_pwd/$tmp/missing" || break + v=`readlink -m "${p}./link3/"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=`readlink -m "${p}link3/more"` || break - test "$v" = "$my_pwd/$tmp/missing/more" || break + v=`readlink -m "${p}link3/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - v=`readlink -m "${p}./link3/more/"` || break - test "$v" = "$my_pwd/$tmp/missing/more" || break + v=`readlink -m "${p}./link3/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/missing/more" || fail=1 - v=`readlink -m "${p}link4"` || break - test "$v" = "$my_pwd/$tmp/subdir/missing" || break + v=`readlink -m "${p}link4"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - v=`readlink -m "${p}./link4/"` || break - test "$v" = "$my_pwd/$tmp/subdir/missing" || break + v=`readlink -m "${p}./link4/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - v=`readlink -m "${p}link4/more"` || break - test "$v" = "$my_pwd/$tmp/subdir/missing/more" || break + v=`readlink -m "${p}link4/more"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 - v=`readlink -m "${p}./link4/more/"` || break - test "$v" = "$my_pwd/$tmp/subdir/missing/more" || break + v=`readlink -m "${p}./link4/more/"` || fail=1 + test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1 - fail=0 done (exit $fail); exit $fail -- cgit v1.2.3-54-g00ecf