Don't assume that we can remove the working directory in tests.

diff --git a/ChangeLog b/ChangeLog
index 68762d5059a30bf02672d6a2c6786619a91cc001..ccec03a5a42ac4afa221fc1c9449a4a96b2aaf50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-07-27  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * tests/readlink/can-e: Don't assume that we can remove the
+       working directory: this isn't possible under Solaris 8, say.
+       * tests/readlink/can-f: Likewise.
+       * tests/readlink/can-m: Likewise.
+
        * src/copy.c (copy_internal): find_backup_file_name no longer
        returns NULL, so don't bother to check for this.
        * src/cp.c (do_copy): Likewise.

diff --git a/tests/readlink/can-e b/tests/readlink/can-e
index 4e36c2f408afc98bce5a5434243eea3a3577e0c7..7d2eb43c008bc17ccf12f167c0f115fb9932620e 100755 (executable)
--- a/tests/readlink/can-e
+++ b/tests/readlink/can-e
@@ -39,9 +39,13 @@ fi
 fail=1
 while :; do
   cd "$pwd/$tmp/removed" || break
-  rmdir ../removed || break
-  v=`readlink -e .` && break
-  test -z "$v" || 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

diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index 3d76b2b1a97e2e8c1460c08878a8a7b5c939570b..d71626df448755620b556c45e448c9033388833e 100755 (executable)
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-f
@@ -39,9 +39,13 @@ fi
 fail=1
 while :; do
   cd "$pwd/$tmp/removed" || break
-  rmdir ../removed || break
-  v=`readlink -f .` && break
-  test -z "$v" || break
+
+  # Skip this test if the system doesn't let you remove the working directory.
+  if rmdir ../removed 2>/dev/null; then
+    v=`readlink -f .` && break
+    test -z "$v" || break
+  fi
+
   cd "$pwd/$tmp" || break
 
   fail=0

diff --git a/tests/readlink/can-m b/tests/readlink/can-m
index cf2de5d52a7f14887ba2cfc91035414f7ce578a7..757e3bcb63b887be407da8cc6f053d13a32effcf 100755 (executable)
--- a/tests/readlink/can-m
+++ b/tests/readlink/can-m
@@ -39,9 +39,13 @@ fi
 fail=1
 while :; do
   cd "$pwd/$tmp/removed" || break
-  rmdir ../removed || break
-  v=`readlink -m .` && break
-  test -z "$v" || 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