diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-02-16 14:37:23 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-02-16 14:37:23 +0000 |
| commit | 989bbe62d0af92da0cac5a228a465f5f97cfcef6 (patch) | |
| tree | 4b8e6e848390dc5548ac65cf89ed40027a075ad6 /tests | |
| parent | 63da080387378f06dd7ac10e0be89c62a0ac64bb (diff) | |
| download | ffmpeg-streaming-989bbe62d0af92da0cac5a228a465f5f97cfcef6.zip ffmpeg-streaming-989bbe62d0af92da0cac5a228a465f5f97cfcef6.tar.gz | |
Remove check for the availability of the -u diff flag, we require it in
other places without checking for its availability already.
Originally committed as revision 12123 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/server-regression.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/server-regression.sh b/tests/server-regression.sh index 244b985..780bdec 100755 --- a/tests/server-regression.sh +++ b/tests/server-regression.sh @@ -1,11 +1,4 @@ #!/bin/bash -# Even in the 21st century some diffs are not supporting -u. -diff -u $0 $0 > /dev/null 2>&1 -if [ $? -eq 0 ]; then - diff_cmd="diff -u" -else - diff_cmd="diff" -fi # Make sure that the data directory exists mkdir -p tests/data @@ -43,7 +36,7 @@ kill $FFMPEG_PID kill $FFSERVER_PID wait > /dev/null 2>&1 rm -f tests/feed1.ffm -if $diff_cmd tests/data/ffserver.regression "$1" ; then +if diff -u tests/data/ffserver.regression "$1" ; then echo echo Server regression test succeeded. exit 0 |
