[Cvs-cvs] Changes to ccvs/src/sanity.sh

[Derek Robert Price]

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1088 ccvs/src/sanity.sh:1.1089
--- ccvs/src/sanity.sh:1.1088   Tue Sep 13 18:48:26 2005
+++ ccvs/src/sanity.sh  Thu Sep 15 19:47:16 2005
@@ -35523,8 +35523,12 @@
     #
     # Test our exit directory so that tests that exit in an incorrect directory
     # are noticed during single test runs.
-    if test "x$TESTDIR" != "x`pwd`"; then
-           fail "cleanup: PWD != TESTDIR (\``pwd`' != \`$TESTDIR')"
+    #
+    # Not sure why `pwd' sometimes resolves symlinks and sometimes doesn't on
+    # Solaris 9, but it does.  Use /bin/pwd to get the canonical directory
+    # name.
+    if test "x`cd $TESTDIR && /bin/pwd`" != "x`/bin/pwd`"; then
+           fail "cleanup: PWD != TESTDIR (\``/bin/pwd`' != \``cd $TESTDIR && 
/bin/pwd`')"
     fi
 
     # Test that the last test didn't overwrite any write proxy configuration