[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2327f16

The following commit has been merged in the master branch:
commit 2327f16f708354b088d358f274abcc37f78e34f9
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Dec 12 11:32:04 2015 +0000

    #1041 set LD_LIBRARY_PATH to ensure the test suite uses the newly built library
---
 jenkins_daily.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index fe24180..ef947ca 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -85,7 +85,12 @@ fi
 # test the build
 if [ -e $dist/$bin/exiv2$exe ]; then
     pushd  test > /dev/null
+    # EXIV2_BINDIR is used by the test suite to locate executables
     export EXIV2_BINDIR=$dist/$bin
+    # set LD_LIBRARY_PATH (and DYLD_LIBRARY_PATH for macosx)
+    # to be sure we run the tests with the newly built library
+	export DYLD_LIBRARY_PATH=$dist/lib
+	export LD_LIBRARY_PATH=$dist/lib
     for test in addmoddel.sh \
         bugfixes-test.sh     \
         exifdata-test.sh     \
@@ -120,9 +125,9 @@ if [ -e $dist/$bin/exiv2$exe ]; then
     fi
     if [ "$PLATFORM" == "msvc" -o  "$PLATFORM" == "cygwin" ]; then
         mmHD="//psf/Host/"
-    fi 
+    fi
     jpubl=$mmHD/Users/Shared/Jenkins/Home/userContent/builds
-    
+
     daily=$jpubl/daily
     weely=$jpubl/weekly
     monly=$jpubl/monthly

-- 
exiv2 packaging