[SCM] libav/experimental: Remove check for the availability of the -u diff flag, we require it in other places without checking for its availability already.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:15:06 UTC 2013
The following commit has been merged in the experimental branch:
commit 989bbe62d0af92da0cac5a228a465f5f97cfcef6
Author: Diego Biurrun <diego at biurrun.de>
Date: Sat Feb 16 14:37:23 2008 +0000
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
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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list