Diego Biurrun <[email protected]> writes: > On Mon, May 14, 2012 at 10:07:23PM +0100, Måns Rullgård wrote: >> Janne Grunau <[email protected]> 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 >> >> 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' > > Another possibility (untested): > > echo << EOF > strip_cr.sh > #! /bin/sh > "$@" | tr -d '\r' > EOF > chmod +x strip_cr.sh > configure --target-exec=./strip_cr.sh
You forgot to include wine in the mix. This simple version would also break the tests that output binary data on stdout. -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
