Adapt tests/readlink/ to use test-lib.sh.

tests/readlink/can-e

@@ -21,114 +21,90 @@ if test "$VERBOSE" = yes; then
   readlink --version
 fi
 
+. $srcdir/../test-lib.sh
+
 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
+my_pwd=$("$abs_top_builddir/src/pwd")
+tmp=d
 
-fail=1
-while :; do
-  bindir=`cd ../../src && pwd`|| break
-  my_pwd=`"$bindir/pwd"` || break
+fail=0
+mkdir $tmp || framework_failure
+cd $tmp || framework_failure
 
-  mkdir -p $tmp || break
-  cd $tmp || break
+mkdir subdir removed || framework_failure
+touch regfile || framework_failure
 
-  mkdir subdir removed || break
-  touch regfile || 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
 
-  ln -s regfile link1 || break
-  ln -s subdir link2 || break
-  ln -s missing link3 || break
-  ln -s subdir/missing link4 || break
+cd "$pwd/$tmp/removed" || framework_failure
 
-  fail=0
-  break
-done
-
-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 -e .` && 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 -e "${p}regfile"` || break
-  test "$v" = "$my_pwd/$tmp/regfile" || break
+  v=`readlink -e "${p}regfile"` || fail=1
+  test "$v" = "$my_pwd/$tmp/regfile" || fail=1
 
-  v=`readlink -e "${p}./regfile/"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}./regfile/"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}subdir"` || break
-  test "$v" = "$my_pwd/$tmp/subdir" || break
+  v=`readlink -e "${p}subdir"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir" || fail=1
 
-  v=`readlink -e "${p}./subdir/"` || break
-  test "$v" = "$my_pwd/$tmp/subdir" || break
+  v=`readlink -e "${p}./subdir/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir" || fail=1
 
-  v=`readlink -e "${p}missing"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}missing"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}./missing/"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}./missing/"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link1"` || break
-  test "$v" = "$my_pwd/$tmp/regfile" || break
+  v=`readlink -e "${p}link1"` || fail=1
+  test "$v" = "$my_pwd/$tmp/regfile" || fail=1
 
-  v=`readlink -e "${p}./link1/"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}./link1/"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link1/more"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}link1/more"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link2"` || break
-  test "$v" = "$my_pwd/$tmp/subdir" || break
+  v=`readlink -e "${p}link2"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir" || fail=1
 
-  v=`readlink -e "${p}./link2/"` || break
-  test "$v" = "$my_pwd/$tmp/subdir" || break
+  v=`readlink -e "${p}./link2/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir" || fail=1
 
-  v=`readlink -e "${p}link2/more"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}link2/more"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link3"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}link3"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}./link3/"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}./link3/"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link3/more"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}link3/more"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link4"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}link4"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}./link4/"` && break
-  test -z "$v" || break
+  v=`readlink -e "${p}./link4/"` && fail=1
+  test -z "$v" || fail=1
 
-  v=`readlink -e "${p}link4/more"` && break
-  test -z "$v" || break
-
-  fail=0
+  v=`readlink -e "${p}link4/more"` && fail=1
+  test -z "$v" || fail=1
 done
 
 (exit $fail); exit $fail