[oggvideotools] 03/05: Fix build problem caused by test script.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository oggvideotools.

commit 61b7de52f4b845c50ddf67eaac2da4ac56e77274
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Sep 22 14:27:22 2015 +0200

    Fix build problem caused by test script.
    
    Rewrite how test script is called during build, to ensure it
    uses the compiled binaries, not the installed ones.
---
 debian/rules              | 2 +-
 debian/tests/test-oggjoin | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4f94850..98cdfaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@ override_dh_strip:
 # Run our test suite until the upstream source get one
 override_dh_auto_test:
 	dh_auto_test
-	PATH=`pwd`/debian/oggvideotools/usr/bin:$$PATH ./debian/tests/test-oggjoin
+	TESTBINDIR=`pwd`/obj-*/src/ ./debian/tests/test-oggjoin
diff --git a/debian/tests/test-oggjoin b/debian/tests/test-oggjoin
index 6980756..3e77a26 100755
--- a/debian/tests/test-oggjoin
+++ b/debian/tests/test-oggjoin
@@ -18,16 +18,16 @@ cd $WORKDIR
 echo "info: Running autopkgtest script $0"
 
 echo "info: Generating Ogg Theora file"
-oggSlideshow /usr/share/pixmaps/debian-logo.png
+${TESTBINDIR}oggSlideshow /usr/share/pixmaps/debian-logo.png
 
 # Join it.
 echo "info: Copy Ogg Theora file using oggJoin."
-oggJoin out.ogv slideshow.ogv
+${TESTBINDIR}oggJoin out.ogv slideshow.ogv
 
 # This should trigger the bug reported in bug #606224, which need an
 # audio file.
 echo "info: Copy Ogg Vorbis file using oggJoin."
-oggJoin out.ogv /usr/lib/python*/dist-packages/pygame/examples/data/house_lo.ogg
+${TESTBINDIR}oggJoin out.ogv /usr/lib/python*/dist-packages/pygame/examples/data/house_lo.ogg
 
 if [ -e out.ogv ] ; then
    echo "success: Ogg Theora file out.ogv created."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/oggvideotools.git