cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] Changes to ccvs/src/sanity.sh [cvs1-11-x-branch]


From: Derek Robert Price
Subject: [Cvs-cvs] Changes to ccvs/src/sanity.sh [cvs1-11-x-branch]
Date: Thu, 15 Sep 2005 15:40:34 -0400

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.179 ccvs/src/sanity.sh:1.752.2.180
--- ccvs/src/sanity.sh:1.752.2.179      Tue Sep 13 15:54:47 2005
+++ ccvs/src/sanity.sh  Thu Sep 15 19:40:25 2005
@@ -29171,8 +29171,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
 
     # Reset val-tags to a pristine state.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]