[SCM] ffmpeg/master: Remove redundant nocheck test

aca-guest at users.alioth.debian.org aca-guest at users.alioth.debian.org
Tue Oct 11 19:51:08 UTC 2016


The following commit has been merged in the master branch:
commit dd2d78e1d678c2f8c3effa5042288f27320d1922
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 20:54:45 2016 +0200

    Remove redundant nocheck test
    
    dh_auto_test already does this correctly.

diff --git a/debian/rules b/debian/rules
index 351d6c4..1da49f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,10 +217,8 @@ override_dh_auto_build-arch:
 
 # Set the library path for the dynamic linker, because the tests otherwise don't find the libraries.
 override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	export LD_LIBRARY_PATH="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale"; \
 		dh_auto_test -a --sourcedirectory=debian/standard -- -k
-endif
 
 # No tests for indep build.
 override_dh_auto_test-indep:

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list