[SCM] ffmpeg/master: fix encdec autopkgtest to not fail, when skipping tests

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b077e0a64da4df0c71f89f38331620d582239a96
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jun 10 21:31:46 2015 +0200

    fix encdec autopkgtest to not fail, when skipping tests

diff --git a/debian/changelog b/debian/changelog
index 493ac51..72feecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ffmpeg (7:2.7-1) UNRELEASED; urgency=medium
   * Import new major upstream release 2.7.
   * Change maintainer to the pkg-multimedia team and move myself to uploaders.
   * Let ffmpeg suggest ffmpeg-doc.
+  * Fix encdec autopkgtest to not fail, when skipping tests.
 
  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Fri, 05 Jun 2015 14:23:01 +0200
 
diff --git a/debian/tests/encdec b/debian/tests/encdec
index 790f808..290c53e 100755
--- a/debian/tests/encdec
+++ b/debian/tests/encdec
@@ -268,7 +268,7 @@ for test in $tests; do
     num_test=$((num_test + 1))
     echo "Test $num_test:"
     # skip the test, if the muxer/encoder is not available
-    available=$(echo "$possible_tests" | grep " $test ")
+    available=$(echo "$possible_tests" | grep " $test ") || true
     if [ ! "$available" ]; then
         skipped="${skipped}${test}\n"
         echo -e "SKIPPED: $test\n\n"

-- 
ffmpeg packaging