[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=3662171

The following commit has been merged in the master branch:
commit 366217134c417da66dbed9b099131a3d1621cd60
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 4 08:09:23 2011 +0000

    Minor test beautifications.
---
 test/bugfixes-test.sh | 14 +++++++++-----
 test/path-test.sh     |  6 +++++-
 test/tiff-test.sh     |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 03fee89..af8bf17 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -182,11 +182,15 @@ $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing
 $bin/exiv2 -u -v -PEkyct $filename
 
 # Test easy-access keys (using a dummy bug number)
-num=726
-filename=exiv2-bug$num.jpg
-cp -f ../data/exiv2-empty.jpg $filename
-$bin/exiv2 -u -v -M"set Exif.Image.Make Samsung" $filename
-$samples/easyaccess-test $filename
+if { test -f "$samples/easyaccess-test" || test -f "$samples/easyaccess-test.exe"; }; then
+    num=726
+    filename=exiv2-bug$num.jpg
+    cp -f ../data/exiv2-empty.jpg $filename
+    $bin/exiv2 -u -v -M"set Exif.Image.Make Samsung" $filename
+    $samples/easyaccess-test $filename
+else
+    echo "bugfixes-test.sh: easyaccess-test executable not found. Skipping regression test for issue #726."
+fi
 
 # Test 'migration of XMP namespaces' (see #751 and related forum post)
 num=751
diff --git a/test/path-test.sh b/test/path-test.sh
index dd4b287..a7386d6 100755
--- a/test/path-test.sh
+++ b/test/path-test.sh
@@ -9,4 +9,8 @@ else
 fi
 cd ./tmp
 
-$bin/path-test ../data/path-test.txt
+if { test -f "$bin/path-test" || test -f "$bin/path-test.exe"; }; then
+    $bin/path-test ../data/path-test.txt
+else
+    echo "path-test.sh: path-test executable not found. Skipping path tests."
+fi
diff --git a/test/tiff-test.sh b/test/tiff-test.sh
index c996cfb..052741e 100644
--- a/test/tiff-test.sh
+++ b/test/tiff-test.sh
@@ -3,7 +3,7 @@
 
 # ----------------------------------------------------------------------
 # Check if the exifprobe tool is available
-if [ `which exifprobe`x = x ] ; then
+if [ `which exifprobe 2>/dev/null`x = x ] ; then
     echo "tiff-test.sh: exifprobe not found. Skipping TIFF tests."
     exit 0
 fi

-- 
exiv2 packaging