[SCM] ffmpeg/experimental: Do not run tests for -indep builds

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Mar 8 00:19:10 UTC 2016


The following commit has been merged in the experimental branch:
commit 2c829f07418e4c8a7a678fc93823326f5db6fe5c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Mar 8 00:57:43 2016 +0100

    Do not run tests for -indep builds

diff --git a/debian/rules b/debian/rules
index b481b6d..bd43459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -230,11 +230,15 @@ override_dh_auto_build-arch:
 	done
 
 # Set the library path for the dynamic linker, because the tests otherwise don't find the libraries.
-override_dh_auto_test:
+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 --sourcedirectory=debian/standard -- -k
+	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:
+
 override_dh_auto_install:
 	dh_auto_install --sourcedirectory=debian/standard
 ifeq ($(DEB_HOST_ARCH),powerpc)

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list