summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2001-05-21 10:35:06 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2001-05-21 10:35:06 +0000
commita60d612e43bc14ce43ece5f135e3be711b966cee (patch)
treed488f16cba2eb32b8e2dd3345940e406fe6f4cc4
parent221d096ed836fcf55d65c6f0887df3f0cd63c328 (diff)
downloadzsh-a60d612e43bc14ce43ece5f135e3be711b966cee.tar.gz
zsh-a60d612e43bc14ce43ece5f135e3be711b966cee.tar.xz
zsh-a60d612e43bc14ce43ece5f135e3be711b966cee.zip
Workaround rm -f hang on unwriteable file in Cygwin
-rw-r--r--ChangeLog3
-rw-r--r--Test/C02cond.ztst6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 982556f54..179d5521e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-21  Peter Stephenson  <pws@csr.com>
 
+	* 14408: Test/C02cond.ztst: do chmod +w to work around rm -f
+	problem in Cygwin.
+
 	* unposted: Test/.distfiles: add Test/E01options.ztst.
 
 2001-05-20  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index ee502d303..2e640f568 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -19,8 +19,6 @@
   chmod u+s modish
   chmod +t modish
 
-  touch unmodish
-  chmod 000 unmodish
 %test
 
   [[ -a zerolength && ! -a nonexistent ]]
@@ -70,7 +68,11 @@
   [[ -p pipe && ! -p zerolength ]]
 0:-p cond
 
+  touch unmodish
+  chmod 000 unmodish
   [[ -r zerolength && ! -r unmodish ]]
+  # This works around a bug in rm -f in some versions of Cygwin
+  chmod 644 unmodish
 0:-r cond
 
   [[ -s nonzerolength && ! -s zerolength ]]