This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH][x86] Regressions - io/ftwtest - due to sed 3.02
- From: Carlos O'Donell <carlos at baldric dot uwo dot ca>
- To: Andreas Schwab <schwab at suse dot de>
- Cc: libc-alpha <libc-alpha at sources dot redhat dot com>
- Date: Mon, 10 Nov 2003 11:56:06 -0500
- Subject: [PATCH][x86] Regressions - io/ftwtest - due to sed 3.02
- References: <20031110074200.GB2400@systemhalted> <jer80g61zz.fsf@sykes.suse.de>
On Mon, Nov 10, 2003 at 09:50:40AM +0100, Andreas Schwab wrote:
> Carlos O'Donell <carlos@baldric.uwo.ca> writes:
>
> > b. Change the script?
> > = Older sed is not happy with nesting like "sed -n '/X$/,${Xb$/p}'"
>
> Try "sed -n '/X$/,${/Xb$/p;}'"
Brilliant. Fixes that issue. Thanks Andreas.
c.
---
2003-11-10 Carlos O'Donell <carlos@baldric.uwo.ca>
* io/ftwtest-sh: Fix nested sed commands.
Index: ftwtest-sh
===================================================================
RCS file: /cvs/glibc/libc/io/ftwtest-sh,v
retrieving revision 1.18
diff -u -p -r1.18 ftwtest-sh
--- ftwtest-sh 7 Nov 2003 22:58:50 -0000 1.18
+++ ftwtest-sh 10 Nov 2003 16:58:28 -0000
@@ -231,7 +231,7 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogr
# If lvl1b comes after lvl1, it shouldn't be printed, while if it
# comes before, it should.
catcmd=cat
-[ -n "`ls -U $tmpdir/foo/ | sed -n '/lvl1$/,${/lvl1b$/p}'`" ] \
+[ -n "`ls -U $tmpdir/foo/ | sed -n '/lvl1$/,${/lvl1b$/p;}'`" ] \
&& catcmd="grep -v lvl1b"
$catcmd <<EOF | diff -u $testout - || exit 1
@@ -255,7 +255,7 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogr
# If file[23]@1b come after file@1b, it shouldn't be printed, while if they
# come before, they should.
regexp=`echo $(ls -U /tmp/ftwtest.d/foo/lvl1b \
- | sed -n '/file@1b$/,${/file[23]@1b$/p}') | sed 's, ,|,'`
+ | sed -n '/file@1b$/,${/file[23]@1b$/p;}') | sed 's, ,|,'`
catcmd=cat
[ -n "$regexp" ] && catcmd="egrep -v $regexp"