[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-64-gdc967b1

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=dc967b18e45bed9591a508ed16bbf4cfa3b0e6b9

The branch, branch-1.6 has been updated
       via  dc967b18e45bed9591a508ed16bbf4cfa3b0e6b9 (commit)
      from  56bb38357ab4ecb8315283d813318174a6c3d45e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc967b18e45bed9591a508ed16bbf4cfa3b0e6b9
Author: Eric Blake <address@hidden>
Date:   Thu Oct 2 06:11:51 2008 -0600

    Work around Solaris' sed inability to process NUL.
    
    * checks/check-them (SED): Allow user to override.
    (err): Postprocess with sed, just like xerr, to avoid differences
    on platforms where sed strips NUL.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    7 +++++++
 checks/check-them |   33 ++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31219e4..780b635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-02  Eric Blake  <address@hidden>
+
+       Work around Solaris' sed inability to process NUL.
+       * checks/check-them (SED): Allow user to override.
+       (err): Postprocess with sed, just like xerr, to avoid differences
+       on platforms where sed strips NUL.
+
 2008-09-25  Eric Blake  <address@hidden>
 
        Tweak error message on command line failure.
diff --git a/checks/check-them b/checks/check-them
index 89f8b41..017e13b 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -41,6 +41,9 @@ skipped=
 strip_needed=false
 diffopts=-c
 
+# Allow user to select sed
+: ${SED=sed}
+
 # Find out where the examples live.
 examples=.
 if test "x$1" = x-I ; then
@@ -56,7 +59,7 @@ if test "x$1" = x-m ; then
 fi
 
 # Find out how the executable prints argv[0]
-m4name=`"$m4" --help | sed -e 's/Usage: \(.*\) \[OPTION.*/\1/' \
+m4name=`"$m4" --help | ${SED} -e 's/Usage: \(.*\) \[OPTION.*/\1/' \
   -e 's/\\\\/\\\\\\\\/g' -e 1q`
 
 # Find out if we should strip \r in the output
@@ -70,7 +73,7 @@ else
 fi
 
 # Find out what version the executable claims to be
-m4version=`sed -n 's/.* //p;q' $out`
+m4version=`${SED} -n 's/.* //p;q' $out`
 
 # Find out if diff supports useful options.
 if diff -u /dev/null /dev/null 2>/dev/null ; then
@@ -88,12 +91,12 @@ do
     continue
   }
   echo "Checking $file"
-  options=`sed -ne '3s/^dnl @ extra options: //p;3q' "$file"`
-  sed -e '/^dnl @/d' -e '/^\^D$/q' "$file" \
+  options=`${SED} -ne '3s/^dnl @ extra options: //p;3q' "$file"`
+  ${SED} -e '/^dnl @/d' -e '/^\^D$/q' "$file" \
     | LC_MESSAGES=C M4PATH=$examples "$m4" -d $options - >$out 2>$err
   stat=$?
 
-  xstat=`sed -ne '2s/^dnl @ expected status: //p;2q' "$file"`
+  xstat=`${SED} -ne '2s/^dnl @ expected status: //p;2q' "$file"`
   case $stat in
     77)
       skipped="$skipped $file"
@@ -103,29 +106,33 @@ do
     $xstat) ;;
     *)
       failed="$failed $file:status"
-      echo `sed -e 's/^dnl //' -e 1q $file`
+      echo `${SED} -e 's/^dnl //' -e 1q $file`
       echo "$file: status was $stat, expected $xstat"
       ;;
   esac
 
-  xoutfile=`sed -n 's/^dnl @ expected output: //p' "$file"`
+  xoutfile=`${SED} -n 's/^dnl @ expected output: //p' "$file"`
   if test -z "$xoutfile" ; then
-    sed -e '/^dnl @result{}/!d' -e 's///' -e "s|examples/|$examples/|" \
+    ${SED} -e '/^dnl @result{}/!d' -e 's///' -e "s|examples/|$examples/|" \
       -e "s|@value{VERSION}|$m4version|" "$file" > $xout
   else
     cp "$examples/$xoutfile" $xout
   fi
 
-  xerrfile=`sed -n 's/^dnl @ expected error: //p' "$file"`
+  xerrfile=`${SED} -n 's/^dnl @ expected error: //p' "$file"`
   case $xerrfile in
     ignore)
       cp $err $xerr ;;
     '')
-      sed '/^dnl @error{}/!d
+      ${SED} '/^dnl @error{}/!d
           s///; '"s|^m4:|$m4name:|; s|examples/|$examples/|" \
         "$file" > $xerr ;;
     *)
-      sed "s|^m4:|$m4name:|; s|examples/|$examples/|" \
+      # This is a no-op for GNU sed, but is important for Solaris sed
+      # which strips NUL bytes from input.
+      ${SED} 's,x,x,' $err > $err.1
+      mv $err.1 $err
+      ${SED} "s|^m4:|$m4name:|; s|examples/|$examples/|" \
         "$examples/$xerrfile" > $xerr ;;
   esac
 
@@ -145,7 +152,7 @@ do
     :
   else
     failed="$failed $file:out"
-    echo `sed -e 's/^dnl //' -e 1q $file`
+    echo `${SED} -e 's/^dnl //' -e 1q $file`
     echo "$file: stdout mismatch"
     diff $diffopts $xout $out
   fi
@@ -154,7 +161,7 @@ do
     :
   else
     failed="$failed $file:err"
-    echo `sed -e 's/^dnl //' -e 1q $file`
+    echo `${SED} -e 's/^dnl //' -e 1q $file`
     echo "$file: stderr mismatch"
     diff $diffopts $xerr $err
   fi


hooks/post-receive
--
GNU M4 source repository