[libav-devel] [RFC] fate: remove \r and \n from result in oneline comparison

Alex Converse alex.converse at gmail.com
Mon May 14 23:09:10 CEST 2012


On Mon, May 14, 2012 at 2:07 PM, Måns Rullgård <mans at mansr.com> wrote:
>
> Janne Grunau <janne-libav at jannau.net> writes:
>
> > Fixes fate on cross-compiled/wine mingw32 configs. The diff comaprison
> > ignores space changes too.
> > ---
> >  tests/fate-run.sh |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/tests/fate-run.sh b/tests/fate-run.sh
> > index a45e9a9..367b152 100755
> > --- a/tests/fate-run.sh
> > +++ b/tests/fate-run.sh
> > @@ -61,7 +61,7 @@ stddev(){
> >  }
> >
> >  oneline(){
> > -    val=$(cat "$2")
> > +    val=$(tr -d '\r\n' < "$2")
>
> NAK

I like it

>
> We should not be doing hacks like this.  They make the code obscure, and
> it is hard to predict where they will be needed.
>
> The systems currently failing are frankensetups which should be fixed to
> present proper data to the scripts.  For example, they could override
> the system cat by setting PATH.  We don't use cat on any binary data, so
> that should work fine.  I verified that all tests pass with this in
> place of the normal cat:
>
> #! /bin/sh
> /bin/cat "$@" | tr -d '\r'
>

I think assuming we'll never use cat on binary data is more invasive than this.


More information about the libav-devel mailing list