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

The following commit has been merged in the master branch:
commit f3f10c5992e68dea07cdb78b2bfb1f465d6e841d
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Nov 10 08:02:20 2012 +0000

    Issue: #850.  More test script refactoring. See SVN: 2935.
---
 test/Makefile          |   3 +
 test/addmoddel.sh      |   4 +-
 test/bugfixes-test.sh  |  10 +-
 test/conversions.sh    | 390 ++++++++++++++++++++++++-------------------------
 test/eps-test.sh       |  61 ++++----
 test/exifdata-test.sh  |   3 +-
 test/exiv2-test.sh     |   6 +-
 test/functions.source  | 133 ++++++++++++++++-
 test/imagetest.sh      |  98 ++++++-------
 test/iotest.sh         |  68 ++-------
 test/iptctest.sh       | 202 ++++++-------------------
 test/modify-test.sh    |  11 +-
 test/path-test.sh      |  15 +-
 test/preview-test.sh   |  10 +-
 test/stringto-test.sh  |   5 +-
 test/tiff-test.sh      |  12 +-
 test/video-test.sh     |  11 +-
 test/write-test.sh     |  39 ++---
 test/write2-test.sh    |   4 +-
 test/xmpparser-test.sh |   7 +-
 20 files changed, 538 insertions(+), 554 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 0ac3d20..5607f0d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -84,6 +84,9 @@ TESTS = addmoddel.sh      \
 TESTV = video-test.sh
 TESTE = eps-test.sh    
 
+tests:
+	cd .. ; make tests
+
 test:
 	@list='$(TESTS)'; for p in $$list; do \
 	    echo Running $$p ...; \
diff --git a/test/addmoddel.sh b/test/addmoddel.sh
index c15a130..d72ea90 100755
--- a/test/addmoddel.sh
+++ b/test/addmoddel.sh
@@ -2,10 +2,12 @@
 # Test driver to run the addmoddel sample program
 source ./functions.source
 
-(
+(	cd "$testdir"
+
 	copyTestFile      exiv2-empty.jpg
 	runTest addmoddel exiv2-empty.jpg
 	runTest exiv2 -pv exiv2-empty.jpg
+
 ) > $results
 
 reportTest
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 16f4000..8e1b11d 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -3,8 +3,7 @@
 
 source ./functions.source
 
-(
-	cd ./tmp
+(	cd "$testdir"
 
 	num=426
 	filename=`prep_file $num`
@@ -52,7 +51,7 @@ source ./functions.source
 
 	num=480
 	filename=`prep_file $num`
-	runTest largeiptc-test $filename ../data/imagemagick.png
+	runTest largeiptc-test $filename $datadir/imagemagick.png
 
 	num=495
 	filename=`prep_file $num`
@@ -183,7 +182,8 @@ source ./functions.source
 	
 	num=799
 	filename=`prep_empty_file $num`
-	runTest exiv2 -v -m ../data/bug$num.cmd $filename
+	copyTestFile         bug$num.cmd
+	runTest exiv2 -v -m  bug$num.cmd $filename
 	runTest exiv2 -v -pa $filename
 	runTest exiv2 -f -eX $filename
 	cat exiv2-bug$num.xmp
@@ -216,7 +216,7 @@ source ./functions.source
 		printf "$num " >&3
 		copyTestFile $filename.rsrc $filename/rsrc
 		runTest exiv2 -M'set Exif.Photo.UserComment Test' $filename
-		diff -q ../data/$filename.rsrc $filename/rsrc
+		diff -q $datadir/$filename.rsrc $filename/rsrc
 	else
 		# skip this test on systems which do not have resource forks
 		printf "($num skipped) " >&3
diff --git a/test/conversions.sh b/test/conversions.sh
index 0eb0dcf..71aa45e 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -12,202 +12,200 @@ if [ $(existsTest xmpparser-test) == 0 ] ; then
     exit 0
 fi
 
-# ----------------------------------------------------------------------
-# Main routine
-(
-cd ./tmp
-IMG=../data/exiv2-empty.jpg
-
-# 1) Convert Exif ImageDescription to XMP x-default langAlt value
-echo Testcase 1
-echo ==========
-
-- 
exiv2 packaging