[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:26 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=48c7c92
The following commit has been merged in the master branch:
commit 48c7c92c5f1f9acf0da43e9a6aef3e032b89eb8c
Author: vog <vog at notjusthosting.com>
Date: Thu Jun 23 11:12:21 2011 +0000
#776: Unified the mechanism by which the test drivers look for binaries (exiv2, samples, etc.), added support for EXIV2_BINDIR, removed the call to "which exiv2"
---
test/addmoddel.sh | 13 +++-
test/bugfixes-test.sh | 129 +++++++++++++++---------------
test/conversions.sh | 198 ++++++++++++++++++++++++-----------------------
test/crw-test.sh | 25 +++---
test/data/exiv2-test.out | 1 -
test/eps-test.sh | 22 ++++--
test/exifdata-test.sh | 14 +++-
test/exiv2-test.sh | 41 +++++-----
test/imagetest.sh | 17 ++--
test/iotest.sh | 11 ++-
test/iptctest.sh | 22 ++++--
test/modify-test.sh | 15 +++-
test/path-test.sh | 11 ++-
test/stringto-test.sh | 10 ++-
test/tiff-test.sh | 11 ++-
test/write-test.sh | 12 ++-
test/write2-test.sh | 10 ++-
test/xmpparser-test.sh | 42 +++++-----
18 files changed, 348 insertions(+), 256 deletions(-)
diff --git a/test/addmoddel.sh b/test/addmoddel.sh
index 8c4f0a2..4d49d44 100755
--- a/test/addmoddel.sh
+++ b/test/addmoddel.sh
@@ -10,12 +10,17 @@ if [ $? -ne 0 ] ; then
diffargs=""
fi
(
-binpath="$VALGRIND ../../samples"
-exiv2="$VALGRIND exiv2"
+if [ -z "$EXIV2_BINDIR" ] ; then
+ bin="$VALGRIND ../../src"
+ samples="$VALGRIND ../../samples"
+else
+ bin="$VALGRIND $EXIV2_BINDIR"
+ samples="$VALGRIND $EXIV2_BINDIR"
+fi
cp -f ./data/exiv2-empty.jpg ./tmp
cd ./tmp
-$binpath/addmoddel exiv2-empty.jpg
-$exiv2 -pv exiv2-empty.jpg
+$samples/addmoddel exiv2-empty.jpg
+$bin/exiv2 -pv exiv2-empty.jpg
) > $results
diff -q $diffargs $results $good
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 8359057..c6ec1c3 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -14,172 +14,177 @@ prep_file()
}
(
-binpath="$VALGRIND ../../samples"
-exiv2="$VALGRIND exiv2 -u"
+if [ -z "$EXIV2_BINDIR" ] ; then
+ bin="$VALGRIND ../../src"
+ samples="$VALGRIND ../../samples"
+else
+ bin="$VALGRIND $EXIV2_BINDIR"
+ samples="$VALGRIND $EXIV2_BINDIR"
+fi
cd ./tmp
num=426
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=440
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=443
filename=`prep_file $num`
-$exiv2 -b -pt $filename
+$bin/exiv2 -u -b -pt $filename
num=444
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=445
filename=`prep_file $num`
-$exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename
-$exiv2 -b -pt $filename
+$bin/exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $filename
+$bin/exiv2 -u -b -pt $filename
filename=exiv2-empty.jpg
cp -f ../data/$filename .
-$exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename
-$exiv2 -b -pt $filename
+$bin/exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $filename
+$bin/exiv2 -u -b -pt $filename
num=447 # Problem only visible in Valgrind
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=452
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename
-$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3" $filename
-$exiv2 -pv $filename
-$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3" $filename
-$exiv2 -pv $filename
+$bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3" $filename
+$bin/exiv2 -u -pv $filename
+$bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3" $filename
+$bin/exiv2 -u -pv $filename
num=460
filename=`prep_file $num`
-$exiv2 -pt $filename
+$bin/exiv2 -u -pt $filename
num=479
filename=`prep_file $num`
-$exiv2 -pt $filename
+$bin/exiv2 -u -pt $filename
num=480
filename=`prep_file $num`
-$binpath/largeiptc-test $filename ../data/imagemagick.png
+$samples/largeiptc-test $filename ../data/imagemagick.png
num=495
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=498
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename
-$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1" $filename
-$exiv2 -v -pv $filename
-$exiv2 -v -M"del Exif.GPSInfo.GPSLatitude" $filename
-$exiv2 -v -pv $filename
+$bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1" $filename
+$bin/exiv2 -u -v -pv $filename
+$bin/exiv2 -u -v -M"del Exif.GPSInfo.GPSLatitude" $filename
+$bin/exiv2 -u -v -pv $filename
num=501
filename=`prep_file $num`
-$exiv2 -pi $filename
+$bin/exiv2 -u -pi $filename
num=528
filename=`prep_file $num`
-$exiv2 -pt $filename
-$exiv2 -v -M"set Exif.Image.Software GI" $filename
+$bin/exiv2 -u -pt $filename
+$bin/exiv2 -u -v -M"set Exif.Image.Software GI" $filename
num=540
filename=`prep_file $num`
-$exiv2 -px $filename
+$bin/exiv2 -u -px $filename
num=554
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2
-$exiv2 -v -M"set Exif.Image.DateTime Date 2007-05-27" $filename
-$exiv2 -pt $filename
+$bin/exiv2 -u -v -M"set Exif.Image.DateTime Date 2007-05-27" $filename
+$bin/exiv2 -u -pt $filename
num=662
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2
-$exiv2 -M"set Exif.Photo.UserComment charset=Ascii An ascii comment" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Ascii An ascii comment" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Ascii A\nnewline" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Ascii A\nnewline" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode A Unicode comment" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode A Unicode comment" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode \u01c4" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode \u01c4" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode A\u01c4C" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode A\u01c4C" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode With\nNewline" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode With\nNewline" $filename
+$bin/exiv2 -u -PEnh $filename
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode With\tTab" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode With\tTab" $filename
+$bin/exiv2 -u -PEnh $filename
# Test invalid escape sequences
-$exiv2 -M"set Exif.Photo.UserComment charset=Unicode \ugggg" $filename
-$exiv2 -PEnh $filename
+$bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode \ugggg" $filename
+$bin/exiv2 -u -PEnh $filename
num=666
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2
-$exiv2 -v -M'set Exif.Image.Make NIKON' \
+$bin/exiv2 -u -v -M'set Exif.Image.Make NIKON' \
-M'set Exif.Image.Model D90' \
-M'set Exif.Nikon3.ShutterCount 100' \
-M'set Exif.Nikon3.SerialNumber 123' \
-M'set Exif.NikonSi02xx.Version 48 50 51 52' \
-M'set Exif.NikonSi02xx.ShutterCount 100' $filename
-$exiv2 -pa -u -b $filename
+$bin/exiv2 -u -pa -u -b $filename
num=683
filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-nikon-d70.jpg $filename
echo '------>' Bug $num '<-------' >&2
-$exiv2 -v -f -r %Y-%m-%d-%a-%j $filename
+$bin/exiv2 -u -v -f -r %Y-%m-%d-%a-%j $filename
num=711
# Little endian (II)
filename=exiv2-bug${num}-1.jpg
cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Initial values, read from the command line' \
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Initial values, read from the command line' \
-M'set Exif.Image.DocumentName Float 0.12345' \
-M'set Exif.Image.ImageDescription Double 0.987654321' $filename
-$exiv2 -v -PEkyct $filename
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
-$exiv2 -v -PEkyct $filename
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
-$exiv2 -v -PEkyct $filename
+$bin/exiv2 -u -v -PEkyct $filename
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
+$bin/exiv2 -u -v -PEkyct $filename
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
+$bin/exiv2 -u -v -PEkyct $filename
# Big endian (MM)
filename=exiv2-bug${num}-2.jpg
cp -f ../data/exiv2-kodak-dc210.jpg $filename
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Initial values, read from the command line' \
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Initial values, read from the command line' \
-M'set Exif.Image.DocumentName Float 0.12345' \
-M'set Exif.Image.ImageDescription Double 0.987654321' $filename
-$exiv2 -v -PEkyct $filename
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
-$exiv2 -v -PEkyct $filename
-$exiv2 -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
-$exiv2 -v -PEkyct $filename
+$bin/exiv2 -u -v -PEkyct $filename
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
+$bin/exiv2 -u -v -PEkyct $filename
+$bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
+$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
-$exiv2 -v -M"set Exif.Image.Make Samsung" $filename
-$binpath/easyaccess-test $filename
+$bin/exiv2 -u -v -M"set Exif.Image.Make Samsung" $filename
+$samples/easyaccess-test $filename
) > $results 2>&1
diff --git a/test/conversions.sh b/test/conversions.sh
index ae9a447..2ded719 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -2,37 +2,41 @@
# XMP parser test driver
# ----------------------------------------------------------------------
+# Setup
+export LC_ALL=C
+results="./conversions.out"
+good="../data/conversions.out"
+if [ -z "$EXIV2_BINDIR" ] ; then
+ bin="$VALGRIND ../../src"
+ samples="$VALGRIND ../../samples"
+else
+ bin="$VALGRIND $EXIV2_BINDIR"
+ samples="$VALGRIND $EXIV2_BINDIR"
+fi
+cd ./tmp
+
+# ----------------------------------------------------------------------
# Check if xmpparser-test exists
-if [ ! -e ../samples/xmpparser-test ] ; then
+if [ ! -e ../../samples/xmpparser-test -a ! -e "$EXIV2_BINDIR/xmpparser-test" ] ; then
echo "xmpparser-test not found. Assuming XMP support is not enabled."
exit 0
fi
# ----------------------------------------------------------------------
-# Setup
-export LC_ALL=C
-results="./tmp/conversions.out"
-good="./data/conversions.out"
-
-# ----------------------------------------------------------------------
# Main routine
(
-binpath="$VALGRIND ../../samples"
-exiv2="$VALGRIND exiv2"
-cd ./tmp
-
IMG=../data/exiv2-empty.jpg
# 1) Convert Exif ImageDescription to XMP x-default langAlt value
echo Testcase 1
echo ==========
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list