[FFmpeg-cvslog] r12123 - trunk/tests/server-regression.sh

diego subversion
Sat Feb 16 15:37:23 CET 2008


Author: diego
Date: Sat Feb 16 15:37:23 2008
New Revision: 12123

Log:
Remove check for the availability of the -u diff flag, we require it in
other places without checking for its availability already.


Modified:
   trunk/tests/server-regression.sh

Modified: trunk/tests/server-regression.sh
==============================================================================
--- trunk/tests/server-regression.sh	(original)
+++ trunk/tests/server-regression.sh	Sat Feb 16 15:37:23 2008
@@ -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




More information about the ffmpeg-cvslog mailing list