Commit 10ef1ada authored by diego's avatar diego

Remove check for the availability of the -u diff flag, we require it in

other places without checking for its availability already.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12123 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 8a062de3
#!/bin/bash #!/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 # Make sure that the data directory exists
mkdir -p tests/data mkdir -p tests/data
...@@ -43,7 +36,7 @@ kill $FFMPEG_PID ...@@ -43,7 +36,7 @@ kill $FFMPEG_PID
kill $FFSERVER_PID kill $FFSERVER_PID
wait > /dev/null 2>&1 wait > /dev/null 2>&1
rm -f tests/feed1.ffm 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
echo Server regression test succeeded. echo Server regression test succeeded.
exit 0 exit 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment