PATCH: random fixes

PATCH: random fixes

[Peter Stephenson]

Three things found while running the test suite over NFS under Solaris.
All breakages must be paid for.

Index: Src/exec.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/exec.c,v
retrieving revision 1.121
diff -u -r1.121 exec.c
--- Src/exec.c	31 Jul 2007 11:26:59 -0000	1.121
+++ Src/exec.c	31 Jul 2007 14:08:35 -0000
@@ -1968,7 +1968,7 @@
 	hn = builtintab->getnode(builtintab, cmdarg);
 	if (!hn) {
 	    lastval = 1;
-	    zerr("unknown builtin: %s");
+	    zerr("unknown builtin: %s", cmdarg);
 	    return NULL;
 	}
     }
Index: Test/B02typeset.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/B02typeset.ztst,v
retrieving revision 1.15
diff -u -r1.15 B02typeset.ztst
--- Test/B02typeset.ztst	31 Jul 2007 11:26:59 -0000	1.15
+++ Test/B02typeset.ztst	31 Jul 2007 14:08:35 -0000
@@ -397,7 +397,7 @@
  (export FOOENV=BAR
  env | grep '^FOOENV'
  print Exec
- exec $ZTST_testdir/../Src/zsh -c '
+ exec $ZTST_testdir/../Src/zsh -fc '
  print Unset
  unset FOOENV
  env | grep "^FOOENV"')
Index: Test/C02cond.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/C02cond.ztst,v
retrieving revision 1.16
diff -u -r1.16 C02cond.ztst
--- Test/C02cond.ztst	19 Dec 2006 12:09:48 -0000	1.16
+++ Test/C02cond.ztst	31 Jul 2007 14:08:35 -0000
@@ -36,7 +36,7 @@
   if [[ -n $block ]]; then
     [[ -b $block[(f)1] && ! -b zerolength ]]
   else
-    print -u8 'Warning: Not testing [[ -b blockdevice ]] (no devices found)'
+    print -u$ZTST_fd 'Warning: Not testing [[ -b blockdevice ]] (no devices found)'
     [[ ! -b zerolength ]]
   fi
 0D:-b cond
@@ -55,7 +55,7 @@
   if [[ -n $block ]]; then
     [[ -f zerolength && ! -f cond && ! -f $char && ! -f $block[(f)1] && ! -f . ]]
   else
-    print -u8 'Warning: Not testing [[ -f blockdevice ]] (no devices found)'
+    print -u$ZTST_fd 'Warning: Not testing [[ -f blockdevice ]] (no devices found)'
     [[ -f zerolength && ! -f cond && ! -f $char && ! -f . ]]
   fi
 0:-f cond
@@ -79,20 +79,20 @@
 0:-o cond
 
   if ! grep '#define HAVE_FIFOS' $ZTST_testdir/../config.h; then
-    print -u8 'Warning: Not testing [[ -p pipe ]] (FIFOs not supported)'
+    print -u$ZTST_fd 'Warning: Not testing [[ -p pipe ]] (FIFOs not supported)'
     [[ ! -p zerolength ]]
   else
     if whence mkfifo && mkfifo pipe || mknod pipe p; then
       [[ -p pipe && ! -p zerolength ]]
     else
-      print -u8 'Warning: Not testing [[ -p pipe ]] (cannot create FIFO)'
+      print -u$ZTST_fd 'Warning: Not testing [[ -p pipe ]] (cannot create FIFO)'
       [[ ! -p zerolength ]]
     fi
   fi
 0dD:-p cond
 
   if (( EUID == 0 )); then
-    print -u8 'Warning: Not testing [[ ! -r file ]] (root reads anything)'
+    print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (root reads anything)'
     [[ -r zerolength && -r unmodish ]]
   else
     [[ -r zerolength && ! -r unmodish ]]
@@ -129,10 +129,10 @@
   cat unmodified
   touch newnewnew
   if [[ $OSTYPE == "cygwin" ]]; then
-    print -u8 "Warning: not testing [[ -N file ]] (not supported on Cygwin)"
+    print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)"
     true
   elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then
-    print -u8 "Warning: not testing [[ -N file ]] (not supported with NFS)"
+    print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)"
     true
   else
     [[ -N newnewnew && ! -N unmodified ]]
@@ -174,7 +174,7 @@
 0:|| and && in conds
 
   if ! grep '#define PATH_DEV_FD' $ZTST_testdir/../config.h; then
-    print -u8 "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)"
+    print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)"
     true
   else
     [[ -e /dev/fd/0 ]]
@@ -182,7 +182,7 @@
 0dD:/dev/fd support in conds handled by access
 
   if ! grep '#define PATH_DEV_FD' $ZTST_testdir/../config.h; then
-    print -u8 "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)"
+    print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)"
     true
   else
     [[ -O /dev/fd/0 ]]

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


.