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=e9fc64c96e19d784a48c58e48646b11cdbacb905 The branch, branch-1.4 has been updated via e9fc64c96e19d784a48c58e48646b11cdbacb905 (commit) from 5116db0fcd37e4480062b4819dca17a98a7890d7 (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 e9fc64c96e19d784a48c58e48646b11cdbacb905 Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Oct 6 16:23:33 2008 -0600 Work around Solaris' sed inability to process NUL. * checks/check-them (SED): Allow user to override. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit dc967b18e45bed9591a508ed16bbf4cfa3b0e6b9) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ checks/check-them | 31 +++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6d3b67..a5cba25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-06 Eric Blake <[EMAIL PROTECTED]> + + Work around Solaris' sed inability to process NUL. + * checks/check-them (SED): Allow user to override. + 2008-09-25 Eric Blake <[EMAIL PROTECTED]> Tweak error message on command line failure. diff --git a/checks/check-them b/checks/check-them index 46162ca..e594119 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 @@ -97,12 +100,12 @@ do continue ;; esac - 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" @@ -112,30 +115,30 @@ 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/|" \ "$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 ;; + "$file" > $xerr ;; *) - sed "s|^m4:|$m4name:|; s|examples/|$examples/|" \ - "$examples/$xerrfile" > $xerr ;; + ${SED} "s|^m4:|$m4name:|; s|examples/|$examples/|" \ + "$examples/$xerrfile" > $xerr ;; esac # For the benefit of mingw, normalize \r\n line endings @@ -154,7 +157,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 @@ -163,7 +166,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
