xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#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"

Browse Source
v0.27.3
vog 14 years ago
parent 9e36ca5dbf
commit 48c7c92c5f
18 changed files with 348 additions and 256 deletions
Show Stats Download Patch File Download Diff File

13
test/addmoddel.sh
Unescape Escape View File

@ -10,12 +10,17 @@ if [ $? -ne 0 ] ; then
diffargs="" diffargs=""
fi fi
( (
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
exiv2="$VALGRIND exiv2" bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cp -f ./data/exiv2-empty.jpg ./tmp cp -f ./data/exiv2-empty.jpg ./tmp
cd ./tmp cd ./tmp
$binpath/addmoddel exiv2-empty.jpg $samples/addmoddel exiv2-empty.jpg
$exiv2 -pv exiv2-empty.jpg $bin/exiv2 -pv exiv2-empty.jpg
) > $results ) > $results
diff -q $diffargs $results $good diff -q $diffargs $results $good

129
test/bugfixes-test.sh
Unescape Escape View File

@ -14,172 +14,177 @@ prep_file()
} }
( (
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
exiv2="$VALGRIND exiv2 -u" bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cd ./tmp cd ./tmp
num=426 num=426
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=440 num=440
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=443 num=443
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -b -pt $filename $bin/exiv2 -u -b -pt $filename
num=444 num=444
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=445 num=445
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename $bin/exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $filename
$exiv2 -b -pt $filename $bin/exiv2 -u -b -pt $filename
filename=exiv2-empty.jpg filename=exiv2-empty.jpg
cp -f ../data/$filename . cp -f ../data/$filename .
$exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename $bin/exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $filename
$exiv2 -b -pt $filename $bin/exiv2 -u -b -pt $filename
num=447 # Problem only visible in Valgrind num=447 # Problem only visible in Valgrind
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=452 num=452
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3" $filename $bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3" $filename
$exiv2 -pv $filename $bin/exiv2 -u -pv $filename
$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3" $filename $bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3" $filename
$exiv2 -pv $filename $bin/exiv2 -u -pv $filename
num=460 num=460
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pt $filename $bin/exiv2 -u -pt $filename
num=479 num=479
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pt $filename $bin/exiv2 -u -pt $filename
num=480 num=480
filename=`prep_file $num` filename=`prep_file $num`
$binpath/largeiptc-test $filename ../data/imagemagick.png $samples/largeiptc-test $filename ../data/imagemagick.png
num=495 num=495
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=498 num=498
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
$exiv2 -v -M"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1" $filename $bin/exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1" $filename
$exiv2 -v -pv $filename $bin/exiv2 -u -v -pv $filename
$exiv2 -v -M"del Exif.GPSInfo.GPSLatitude" $filename $bin/exiv2 -u -v -M"del Exif.GPSInfo.GPSLatitude" $filename
$exiv2 -v -pv $filename $bin/exiv2 -u -v -pv $filename
num=501 num=501
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pi $filename $bin/exiv2 -u -pi $filename
num=528 num=528
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -pt $filename $bin/exiv2 -u -pt $filename
$exiv2 -v -M"set Exif.Image.Software GI" $filename $bin/exiv2 -u -v -M"set Exif.Image.Software GI" $filename
num=540 num=540
filename=`prep_file $num` filename=`prep_file $num`
$exiv2 -px $filename $bin/exiv2 -u -px $filename
num=554 num=554
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2 echo '------>' Bug $num '<-------' >&2
$exiv2 -v -M"set Exif.Image.DateTime Date 2007-05-27" $filename $bin/exiv2 -u -v -M"set Exif.Image.DateTime Date 2007-05-27" $filename
$exiv2 -pt $filename $bin/exiv2 -u -pt $filename
num=662 num=662
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2 echo '------>' Bug $num '<-------' >&2
$exiv2 -M"set Exif.Photo.UserComment charset=Ascii An ascii comment" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Ascii An ascii comment" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Ascii A\\nnewline" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Ascii A\\nnewline" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode A Unicode comment" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode A Unicode comment" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode \\u01c4" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode \\u01c4" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode A\\u01c4C" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode A\\u01c4C" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode With\\nNewline" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode With\\nNewline" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode With\\tTab" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode With\\tTab" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
# Test invalid escape sequences # Test invalid escape sequences
$exiv2 -M"set Exif.Photo.UserComment charset=Unicode \\ugggg" $filename $bin/exiv2 -u -M"set Exif.Photo.UserComment charset=Unicode \\ugggg" $filename
$exiv2 -PEnh $filename $bin/exiv2 -u -PEnh $filename
num=666 num=666
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2 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.Image.Model D90' \
-M'set Exif.Nikon3.ShutterCount 100' \ -M'set Exif.Nikon3.ShutterCount 100' \
-M'set Exif.Nikon3.SerialNumber 123' \ -M'set Exif.Nikon3.SerialNumber 123' \
-M'set Exif.NikonSi02xx.Version 48 50 51 52' \ -M'set Exif.NikonSi02xx.Version 48 50 51 52' \
-M'set Exif.NikonSi02xx.ShutterCount 100' $filename -M'set Exif.NikonSi02xx.ShutterCount 100' $filename
$exiv2 -pa -u -b $filename $bin/exiv2 -u -pa -u -b $filename
num=683 num=683
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-nikon-d70.jpg $filename cp -f ../data/exiv2-nikon-d70.jpg $filename
echo '------>' Bug $num '<-------' >&2 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 num=711
# Little endian (II) # Little endian (II)
filename=exiv2-bug${num}-1.jpg filename=exiv2-bug${num}-1.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
echo '------>' Bug $num '<-------' >&2 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.DocumentName Float 0.12345' \
-M'set Exif.Image.ImageDescription Double 0.987654321' $filename -M'set Exif.Image.ImageDescription Double 0.987654321' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
$exiv2 -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
$exiv2 -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
# Big endian (MM) # Big endian (MM)
filename=exiv2-bug${num}-2.jpg filename=exiv2-bug${num}-2.jpg
cp -f ../data/exiv2-kodak-dc210.jpg $filename 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.DocumentName Float 0.12345' \
-M'set Exif.Image.ImageDescription Double 0.987654321' $filename -M'set Exif.Image.ImageDescription Double 0.987654321' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
$exiv2 -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
$exiv2 -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
$exiv2 -v -PEkyct $filename $bin/exiv2 -u -v -PEkyct $filename
# Test easy-access keys (using a dummy bug number) # Test easy-access keys (using a dummy bug number)
num=726 num=726
filename=exiv2-bug$num.jpg filename=exiv2-bug$num.jpg
cp -f ../data/exiv2-empty.jpg $filename cp -f ../data/exiv2-empty.jpg $filename
$exiv2 -v -M"set Exif.Image.Make Samsung" $filename $bin/exiv2 -u -v -M"set Exif.Image.Make Samsung" $filename
$binpath/easyaccess-test $filename $samples/easyaccess-test $filename
) > $results 2>&1 ) > $results 2>&1

198
test/conversions.sh
Unescape Escape View File

@ -1,38 +1,42 @@
#! /bin/sh #! /bin/sh
# XMP parser test driver # 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 # 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." echo "xmpparser-test not found. Assuming XMP support is not enabled."
exit 0 exit 0
fi fi
# ----------------------------------------------------------------------
# Setup
export LC_ALL=C
results="./tmp/conversions.out"
good="./data/conversions.out"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Main routine # Main routine
( (
binpath="$VALGRIND ../../samples"
exiv2="$VALGRIND exiv2"
cd ./tmp
IMG=../data/exiv2-empty.jpg IMG=../data/exiv2-empty.jpg
# 1) Convert Exif ImageDescription to XMP x-default langAlt value # 1) Convert Exif ImageDescription to XMP x-default langAlt value
echo Testcase 1 echo Testcase 1
echo ========== echo ==========
\cp $IMG h.jpg \cp $IMG h.jpg
$exiv2 -M'set Exif.Image.ImageDescription The Exif image description' h.jpg $bin/exiv2 -M'set Exif.Image.ImageDescription The Exif image description' h.jpg
rm -f h.xmp rm -f h.xmp
$exiv2 -eX h.jpg $bin/exiv2 -eX h.jpg
$exiv2 -px h.xmp $bin/exiv2 -px h.xmp
$exiv2 -PEkycv h.xmp $bin/exiv2 -PEkycv h.xmp
$exiv2 -pi h.xmp $bin/exiv2 -pi h.xmp
# 2) Convert XMP x-default langAlt value back to Exif ImageDescription # 2) Convert XMP x-default langAlt value back to Exif ImageDescription
echo echo
@ -40,10 +44,10 @@ echo Testcase 2
echo ========== echo ==========
\cp $IMG i.jpg \cp $IMG i.jpg
\cp h.xmp i.xmp \cp h.xmp i.xmp
$exiv2 -iX i.jpg $bin/exiv2 -iX i.jpg
$exiv2 -px i.jpg $bin/exiv2 -px i.jpg
$exiv2 -PEkycv i.jpg $bin/exiv2 -PEkycv i.jpg
$exiv2 -pi i.jpg $bin/exiv2 -pi i.jpg
# 3) Convert XMP single non-x-default langAlt value to Exif ImageDescription # 3) Convert XMP single non-x-default langAlt value to Exif ImageDescription
echo echo
@ -51,10 +55,10 @@ echo Testcase 3
echo ========== echo ==========
sed s/x-default/de-DE/ i.xmp > j.xmp sed s/x-default/de-DE/ i.xmp > j.xmp
\cp $IMG j.jpg \cp $IMG j.jpg
$exiv2 -iX j.jpg $bin/exiv2 -iX j.jpg
$exiv2 -px j.jpg $bin/exiv2 -px j.jpg
$exiv2 -PEkycv j.jpg $bin/exiv2 -PEkycv j.jpg
$exiv2 -pi j.jpg $bin/exiv2 -pi j.jpg
# 4) This shouldn't work: No x-default, more than one language # 4) This shouldn't work: No x-default, more than one language
echo echo
@ -62,36 +66,36 @@ echo Testcase 4
echo ========== echo ==========
sed 's,<rdf:li xml:lang="de-DE">The Exif image description</rdf:li>,<rdf:li xml:lang="de-DE">The Exif image description</rdf:li><rdf:li xml:lang="it-IT">Ciao bella</rdf:li>,' j.xmp > k.xmp sed 's,<rdf:li xml:lang="de-DE">The Exif image description</rdf:li>,<rdf:li xml:lang="de-DE">The Exif image description</rdf:li><rdf:li xml:lang="it-IT">Ciao bella</rdf:li>,' j.xmp > k.xmp
\cp $IMG k.jpg \cp $IMG k.jpg
$exiv2 -iX k.jpg $bin/exiv2 -iX k.jpg
$exiv2 -px k.jpg $bin/exiv2 -px k.jpg
$exiv2 -v -PEkycv k.jpg $bin/exiv2 -v -PEkycv k.jpg
$exiv2 -v -pi k.jpg $bin/exiv2 -v -pi k.jpg
# 5) Add a default language to the XMP file and convert to Exif and IPTC # 5) Add a default language to the XMP file and convert to Exif and IPTC
echo echo
echo Testcase 5 echo Testcase 5
echo ========== echo ==========
\cp k.xmp l.xmp \cp k.xmp l.xmp
$exiv2 -M'set Xmp.dc.description lang="x-default" How to fix this mess' l.xmp $bin/exiv2 -M'set Xmp.dc.description lang="x-default" How to fix this mess' l.xmp
grep x-default l.xmp grep x-default l.xmp
\cp $IMG l.jpg \cp $IMG l.jpg
$exiv2 -iX l.jpg $bin/exiv2 -iX l.jpg
$exiv2 -px l.jpg $bin/exiv2 -px l.jpg
$exiv2 -PEkycv l.jpg $bin/exiv2 -PEkycv l.jpg
$exiv2 -pi l.jpg $bin/exiv2 -pi l.jpg
# 6) Convert an Exif user comment to XMP # 6) Convert an Exif user comment to XMP
echo echo
echo Testcase 6 echo Testcase 6
echo ========== echo ==========
\cp $IMG m.jpg \cp $IMG m.jpg
$exiv2 -M'set Exif.Photo.UserComment charset=Jis This is a JIS encoded Exif user comment. Or was it?' m.jpg $bin/exiv2 -M'set Exif.Photo.UserComment charset=Jis This is a JIS encoded Exif user comment. Or was it?' m.jpg
$exiv2 -PEkycv m.jpg $bin/exiv2 -PEkycv m.jpg
rm -f m.xmp rm -f m.xmp
$exiv2 -eX m.jpg $bin/exiv2 -eX m.jpg
$exiv2 -px m.xmp $bin/exiv2 -px m.xmp
$exiv2 -PEkycv m.xmp $bin/exiv2 -PEkycv m.xmp
$exiv2 -v -pi m.xmp $bin/exiv2 -v -pi m.xmp
# 7) And back to Exif # 7) And back to Exif
echo echo
@ -99,25 +103,25 @@ echo Testcase 7
echo ========== echo ==========
\cp $IMG n.jpg \cp $IMG n.jpg
\cp m.xmp n.xmp \cp m.xmp n.xmp
$exiv2 -iX n.jpg $bin/exiv2 -iX n.jpg
$exiv2 -px n.jpg $bin/exiv2 -px n.jpg
$exiv2 -PEkycv n.jpg $bin/exiv2 -PEkycv n.jpg
$exiv2 -v -pi n.jpg $bin/exiv2 -v -pi n.jpg
# 8) Convert IPTC keywords to XMP # 8) Convert IPTC keywords to XMP
echo echo
echo Testcase 8 echo Testcase 8
echo ========== echo ==========
\cp $IMG o.jpg \cp $IMG o.jpg
$exiv2 -M'add Iptc.Application2.Keywords Sex' o.jpg $bin/exiv2 -M'add Iptc.Application2.Keywords Sex' o.jpg
$exiv2 -M'add Iptc.Application2.Keywords Drugs' o.jpg $bin/exiv2 -M'add Iptc.Application2.Keywords Drugs' o.jpg
$exiv2 -M"add Iptc.Application2.Keywords Rock'n'roll" o.jpg $bin/exiv2 -M"add Iptc.Application2.Keywords Rock'n'roll" o.jpg
$exiv2 -pi o.jpg $bin/exiv2 -pi o.jpg
rm -f o.xmp rm -f o.xmp
$exiv2 -eX o.jpg $bin/exiv2 -eX o.jpg
$exiv2 -px o.xmp $bin/exiv2 -px o.xmp
$exiv2 -v -PEkycv o.xmp $bin/exiv2 -v -PEkycv o.xmp
$exiv2 -pi o.xmp $bin/exiv2 -pi o.xmp
# 9) And back to IPTC # 9) And back to IPTC
echo echo
@ -125,23 +129,23 @@ echo Testcase 9
echo ========== echo ==========
\cp $IMG p.jpg \cp $IMG p.jpg
\cp o.xmp p.xmp \cp o.xmp p.xmp
$exiv2 -iX p.jpg $bin/exiv2 -iX p.jpg
$exiv2 -px p.jpg $bin/exiv2 -px p.jpg
$exiv2 -v -PEkycv p.jpg $bin/exiv2 -v -PEkycv p.jpg
$exiv2 -pi p.jpg $bin/exiv2 -pi p.jpg
# 10) Convert an Exif tag to an XMP text value # 10) Convert an Exif tag to an XMP text value
echo echo
echo Testcase 10 echo Testcase 10
echo =========== echo ===========
\cp $IMG q.jpg \cp $IMG q.jpg
$exiv2 -M'set Exif.Image.Software Exiv2' q.jpg $bin/exiv2 -M'set Exif.Image.Software Exiv2' q.jpg
$exiv2 -PEkycv q.jpg $bin/exiv2 -PEkycv q.jpg
rm -f q.xmp rm -f q.xmp
$exiv2 -eX q.jpg $bin/exiv2 -eX q.jpg
$exiv2 -px q.xmp $bin/exiv2 -px q.xmp
$exiv2 -PEkycv q.xmp $bin/exiv2 -PEkycv q.xmp
$exiv2 -v -pi q.xmp $bin/exiv2 -v -pi q.xmp
# 11) And back to Exif # 11) And back to Exif
echo echo
@ -149,23 +153,23 @@ echo Testcase 11
echo =========== echo ===========
\cp $IMG r.jpg \cp $IMG r.jpg
\cp q.xmp r.xmp \cp q.xmp r.xmp
$exiv2 -iX r.jpg $bin/exiv2 -iX r.jpg
$exiv2 -px r.jpg $bin/exiv2 -px r.jpg
$exiv2 -PEkycv r.jpg $bin/exiv2 -PEkycv r.jpg
$exiv2 -v -pi r.jpg $bin/exiv2 -v -pi r.jpg
# 12) Convert an IPTC dataset to an XMP text value # 12) Convert an IPTC dataset to an XMP text value
echo echo
echo Testcase 12 echo Testcase 12
echo =========== echo ===========
\cp $IMG s.jpg \cp $IMG s.jpg
$exiv2 -M'set Iptc.Application2.SubLocation Kuala Lumpur' s.jpg $bin/exiv2 -M'set Iptc.Application2.SubLocation Kuala Lumpur' s.jpg
$exiv2 -pi s.jpg $bin/exiv2 -pi s.jpg
rm -f s.xmp rm -f s.xmp
$exiv2 -eX s.jpg $bin/exiv2 -eX s.jpg
$exiv2 -px s.xmp $bin/exiv2 -px s.xmp
$exiv2 -v -PEkycv s.xmp $bin/exiv2 -v -PEkycv s.xmp
$exiv2 -pi s.xmp $bin/exiv2 -pi s.xmp
# 13) And back to IPTC # 13) And back to IPTC
echo echo
@ -173,34 +177,34 @@ echo Testcase 13
echo =========== echo ===========
\cp $IMG t.jpg \cp $IMG t.jpg
\cp s.xmp t.xmp \cp s.xmp t.xmp
$exiv2 -iX t.jpg $bin/exiv2 -iX t.jpg
$exiv2 -px t.jpg $bin/exiv2 -px t.jpg
$exiv2 -v -PEkycv t.jpg $bin/exiv2 -v -PEkycv t.jpg
$exiv2 -pi t.jpg $bin/exiv2 -pi t.jpg
# 14) Convert a few other tags of interest from Exif/IPTC to XMP # 14) Convert a few other tags of interest from Exif/IPTC to XMP
echo echo
echo Testcase 14 echo Testcase 14
echo =========== echo ===========
\cp $IMG u.jpg \cp $IMG u.jpg
$exiv2 -M'set Exif.Photo.DateTimeOriginal 2003:12:14 12:01:44' u.jpg $bin/exiv2 -M'set Exif.Photo.DateTimeOriginal 2003:12:14 12:01:44' u.jpg
$exiv2 -M'set Exif.Photo.SubSecTimeOriginal 999999999' u.jpg $bin/exiv2 -M'set Exif.Photo.SubSecTimeOriginal 999999999' u.jpg
$exiv2 -M'set Exif.Photo.ExifVersion 48 50 50 49' u.jpg $bin/exiv2 -M'set Exif.Photo.ExifVersion 48 50 50 49' u.jpg
$exiv2 -M'set Exif.Photo.ComponentsConfiguration 1 2 3 0' u.jpg $bin/exiv2 -M'set Exif.Photo.ComponentsConfiguration 1 2 3 0' u.jpg
$exiv2 -M'set Exif.Photo.Flash 73' u.jpg $bin/exiv2 -M'set Exif.Photo.Flash 73' u.jpg
$exiv2 -M'set Exif.GPSInfo.GPSLatitude 3/1 8/1 29734512/1000000' u.jpg $bin/exiv2 -M'set Exif.GPSInfo.GPSLatitude 3/1 8/1 29734512/1000000' u.jpg
$exiv2 -M'set Exif.GPSInfo.GPSLatitudeRef N' u.jpg $bin/exiv2 -M'set Exif.GPSInfo.GPSLatitudeRef N' u.jpg
$exiv2 -M'set Exif.GPSInfo.GPSVersionID 2 2 0 1' u.jpg $bin/exiv2 -M'set Exif.GPSInfo.GPSVersionID 2 2 0 1' u.jpg
$exiv2 -M'set Exif.GPSInfo.GPSTimeStamp 1/1 2/1 999999999/1000000000' u.jpg $bin/exiv2 -M'set Exif.GPSInfo.GPSTimeStamp 1/1 2/1 999999999/1000000000' u.jpg
$exiv2 -M'set Iptc.Application2.DateCreated 2007-05-09' u.jpg $bin/exiv2 -M'set Iptc.Application2.DateCreated 2007-05-09' u.jpg
$exiv2 -PEkycv u.jpg $bin/exiv2 -PEkycv u.jpg
$exiv2 -pi u.jpg $bin/exiv2 -pi u.jpg
rm -f u.xmp rm -f u.xmp
$exiv2 -eX u.jpg $bin/exiv2 -eX u.jpg
$exiv2 -px u.xmp $bin/exiv2 -px u.xmp
$exiv2 -PEkycv u.xmp $bin/exiv2 -PEkycv u.xmp
$exiv2 -pi u.xmp $bin/exiv2 -pi u.xmp
# 15) And back to Exif/IPTC # 15) And back to Exif/IPTC
echo echo
@ -208,11 +212,11 @@ echo Testcase 15
echo =========== echo ===========
\cp $IMG v.jpg \cp $IMG v.jpg
\cp u.xmp v.xmp \cp u.xmp v.xmp
$exiv2 -M'set Xmp.tiff.DateTime 2003-12-14T12:01:44Z' v.xmp $bin/exiv2 -M'set Xmp.tiff.DateTime 2003-12-14T12:01:44Z' v.xmp
TZ=GMT-8 $exiv2 -iX v.jpg TZ=GMT-8 $bin/exiv2 -iX v.jpg
$exiv2 -px v.jpg $bin/exiv2 -px v.jpg
$exiv2 -PEkycv v.jpg $bin/exiv2 -PEkycv v.jpg
$exiv2 -pi v.jpg $bin/exiv2 -pi v.jpg
) > $results 2>&1 ) > $results 2>&1

25
test/crw-test.sh
Unescape Escape View File

@ -16,8 +16,13 @@ fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Main routine # Main routine
( (
binpath="$VALGRIND ../../src" if [ -z "$EXIV2_BINDIR" ] ; then
exiv2="$VALGRIND exiv2" bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cmdfile=cmdfile cmdfile=cmdfile
crwfile=exiv2-canon-powershot-s40.crw crwfile=exiv2-canon-powershot-s40.crw
@ -37,12 +42,12 @@ set Exif.Photo.DateTimeOriginal 2007:11:11 09:10:11
EOF EOF
cp -f ../data/$crwfile . cp -f ../data/$crwfile .
$exiv2 -v -pt $crwfile $bin/exiv2 -v -pt $crwfile
$exiv2 -v -m $cmdfile $crwfile $bin/exiv2 -v -m $cmdfile $crwfile
$binpath/crwparse $crwfile $bin/crwparse $crwfile
$exiv2 -v -pt $crwfile $bin/exiv2 -v -pt $crwfile
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Testcases: Delete tags # Testcases: Delete tags
@ -52,12 +57,12 @@ del Exif.Canon.OwnerName
EOF EOF
cp -f ../data/$crwfile . cp -f ../data/$crwfile .
$exiv2 -v -pt $crwfile $bin/exiv2 -v -pt $crwfile
$exiv2 -v -m $cmdfile $crwfile $bin/exiv2 -v -m $cmdfile $crwfile
$binpath/crwparse $crwfile $bin/crwparse $crwfile
$exiv2 -v -pt $crwfile $bin/exiv2 -v -pt $crwfile
) > $results 2>&1 ) > $results 2>&1

1
test/data/exiv2-test.out
Unescape Escape View File

@ -2,7 +2,6 @@ Exiv2 test directory -----------------------------------------------------
tmp/ tmp/
Exiv2 version ------------------------------------------------------------ Exiv2 version ------------------------------------------------------------
/usr/local/bin/exiv2
exiv2 0.21.1 (__ bit build) exiv2 0.21.1 (__ bit build)
Copyright (C) 2004-2011 Andreas Huggel. Copyright (C) 2004-2011 Andreas Huggel.

22
test/eps-test.sh
Unescape Escape View File

@ -5,9 +5,15 @@ export LC_ALL=C
cd tmp/ cd tmp/
exiv2="$VALGRIND ../../src/exiv2" if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
exiv2version="`$exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,\1,p'`" exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,\1,p'`"
if [ -z "$exiv2version" ]; then if [ -z "$exiv2version" ]; then
echo "Error: Unable to determine Exiv2 version" echo "Error: Unable to determine Exiv2 version"
exit 1 exit 1
@ -38,7 +44,7 @@ done
echo echo
echo "Command: exiv2 -u -pa $image.eps" echo "Command: exiv2 -u -pa $image.eps"
$exiv2 -u -pa "$image.eps" $bin/exiv2 -u -pa "$image.eps"
exitcode="$?" exitcode="$?"
echo "Exit code: $exitcode" echo "Exit code: $exitcode"
@ -48,12 +54,12 @@ done
echo echo
echo "Command: exiv2 -pp $image.eps" echo "Command: exiv2 -pp $image.eps"
$exiv2 -pp "$image.eps" $bin/exiv2 -pp "$image.eps"
echo "Exit code: $?" echo "Exit code: $?"
echo echo
echo "Command: exiv2 -f -eX $image.eps" echo "Command: exiv2 -f -eX $image.eps"
$exiv2 -f -eX "$image.eps" $bin/exiv2 -f -eX "$image.eps"
echo "Exit code: $?" echo "Exit code: $?"
diff -q "../data/eps/$image.xmp" "$image.xmp" diff -q "../data/eps/$image.xmp" "$image.xmp"
@ -65,7 +71,7 @@ done
echo echo
echo "Command: exiv2 -ix $image.eps" echo "Command: exiv2 -ix $image.eps"
$exiv2 -ix "$image.eps" $bin/exiv2 -ix "$image.eps"
exitcode="$?" exitcode="$?"
echo "Exit code: $exitcode" echo "Exit code: $exitcode"
@ -79,7 +85,7 @@ done
echo echo
echo "Command: (2) exiv2 -ix $image.eps" echo "Command: (2) exiv2 -ix $image.eps"
$exiv2 -ix "$image.eps" $bin/exiv2 -ix "$image.eps"
echo "Exit code: $?" echo "Exit code: $?"
diff -q "$image.eps.newxmp" "$image.eps" diff -q "$image.eps.newxmp" "$image.eps"
@ -90,7 +96,7 @@ done
echo echo
echo "Command: exiv2 -f -ex $image.eps" echo "Command: exiv2 -f -ex $image.eps"
$exiv2 -f -ex "$image.eps" $bin/exiv2 -f -ex "$image.eps"
echo "Exit code: $?" echo "Exit code: $?"
diff -q "../data/eps/eps-test-newxmp.exv" "$image.exv" diff -q "../data/eps/eps-test-newxmp.exv" "$image.exv"

14
test/exifdata-test.sh
Unescape Escape View File

@ -10,14 +10,20 @@ if [ $? -ne 0 ] ; then
diffargs="" diffargs=""
fi fi
( (
binpath="$VALGRIND ../../samples" 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-gc.jpg ./tmp cp -f ./data/exiv2-gc.jpg ./tmp
cp -f ./data/exiv2-canon-powershot-s40.jpg ./tmp cp -f ./data/exiv2-canon-powershot-s40.jpg ./tmp
cp -f ./data/exiv2-nikon-d70.jpg ./tmp cp -f ./data/exiv2-nikon-d70.jpg ./tmp
cd ./tmp cd ./tmp
$binpath/exifdata-test exiv2-gc.jpg $samples/exifdata-test exiv2-gc.jpg
$binpath/exifdata-test exiv2-canon-powershot-s40.jpg $samples/exifdata-test exiv2-canon-powershot-s40.jpg
$binpath/exifdata-test exiv2-nikon-d70.jpg $samples/exifdata-test exiv2-nikon-d70.jpg
) > $results ) > $results
diff -q $diffargs $results $good diff -q $diffargs $results $good

41
test/exiv2-test.sh
Unescape Escape View File

@ -1,7 +1,13 @@
#! /bin/sh #! /bin/sh
# Test driver for exiv2 utility tests # Test driver for exiv2 utility tests
export LC_ALL=C export LC_ALL=C
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
results="./tmp/exiv2-test.out" results="./tmp/exiv2-test.out"
good="./data/exiv2-test.out" good="./data/exiv2-test.out"
tmpfile=tmp/ttt tmpfile=tmp/ttt
@ -77,44 +83,43 @@ cd tmp/ >/dev/null || exit 1;
echo tmp/ echo tmp/
echo echo
echo "Exiv2 version ------------------------------------------------------------" echo "Exiv2 version ------------------------------------------------------------"
which exiv2 || exit 2; $bin/exiv2 -u -V | sed '1 s, (.. bit build)$, (__ bit build),'
$exiv2 -V | sed '1 s, (.. bit build)$, (__ bit build),'
echo echo
echo "Exiv2 help ---------------------------------------------------------------" echo "Exiv2 help ---------------------------------------------------------------"
$exiv2 -h $bin/exiv2 -u -h
echo echo
echo "Adjust -------------------------------------------------------------------" echo "Adjust -------------------------------------------------------------------"
$exiv2 -v -a-12:01:01 adjust $images $bin/exiv2 -u -v -a-12:01:01 adjust $images
echo echo
echo "Rename -------------------------------------------------------------------" echo "Rename -------------------------------------------------------------------"
$exiv2 -vf rename $images $bin/exiv2 -u -vf rename $images
echo echo
echo "Print --------------------------------------------------------------------" echo "Print --------------------------------------------------------------------"
$exiv2 -v print $image2 $bin/exiv2 -u -v print $image2
$exiv2 -v -b -pt print $image2 $bin/exiv2 -u -v -b -pt print $image2
$exiv2 -v -b -pt print $image2 > iii $bin/exiv2 -u -v -b -pt print $image2 > iii
echo echo
echo "Extract Exif data --------------------------------------------------------" echo "Extract Exif data --------------------------------------------------------"
$exiv2 -vf extract $image2 $bin/exiv2 -u -vf extract $image2
echo echo
echo "Extract Thumbnail --------------------------------------------------------" echo "Extract Thumbnail --------------------------------------------------------"
$exiv2 -vf -et extract $image2 $bin/exiv2 -u -vf -et extract $image2
$exiv2 -v -b -pt print $image3 > jjj $bin/exiv2 -u -v -b -pt print $image3 > jjj
echo echo
echo "Compare image data and extracted data ------------------------------------" echo "Compare image data and extracted data ------------------------------------"
diff iii jjj diff iii jjj
echo echo
echo "Delete Thumbnail ---------------------------------------------------------" echo "Delete Thumbnail ---------------------------------------------------------"
$exiv2 -v -dt delete $image2 $bin/exiv2 -u -v -dt delete $image2
$exiv2 -vf -et extract $image2 $bin/exiv2 -u -vf -et extract $image2
echo echo
echo "Delete Exif data ---------------------------------------------------------" echo "Delete Exif data ---------------------------------------------------------"
$exiv2 -v delete $image2 $bin/exiv2 -u -v delete $image2
$exiv2 -v print $image2 $bin/exiv2 -u -v print $image2
echo echo
echo "Insert Exif data ---------------------------------------------------------" echo "Insert Exif data ---------------------------------------------------------"
$exiv2 -v insert $image2 $bin/exiv2 -u -v insert $image2
$exiv2 -v -b -pt print $image3 > kkk $bin/exiv2 -u -v -b -pt print $image3 > kkk
echo echo
echo "Compare original and inserted image data ---------------------------------" echo "Compare original and inserted image data ---------------------------------"
diff iii kkk diff iii kkk

17
test/imagetest.sh
Unescape Escape View File

@ -11,7 +11,7 @@ eraseTest()
cp $datapath/$src $test cp $datapath/$src $test
#run tests #run tests
$binpath/metacopy $test $test $bin/metacopy $test $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -30,7 +30,7 @@ copyTest()
cp $datapath/$dst $test cp $datapath/$dst $test
#run tests #run tests
$binpath/metacopy -a $datapath/$src $test $bin/metacopy -a $datapath/$src $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -49,7 +49,7 @@ iptcTest()
cp $datapath/$dst $test cp $datapath/$dst $test
#run tests #run tests
$binpath/metacopy -ip $datapath/$src $test $bin/metacopy -ip $datapath/$src $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -75,9 +75,14 @@ diffCheck()
# ********************************************************************** # **********************************************************************
# main # main
LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH if [ -z "$EXIV2_BINDIR" ] ; then
export LD_LIBRARY_PATH bin="$VALGRIND ../../src"
binpath="$VALGRIND ../../src" samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
datapath="../data" datapath="../data"
test_files="table.jpg smiley1.jpg smiley2.jpg" test_files="table.jpg smiley1.jpg smiley2.jpg"

11
test/iotest.sh
Unescape Escape View File

@ -8,7 +8,7 @@ ioTest()
out2=${1}.2 out2=${1}.2
#run tests #run tests
$binpath/iotest $src $out1 $out2 $samples/iotest $src $out1 $out2
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
errors=`expr $errors + 1` errors=`expr $errors + 1`
return return
@ -38,7 +38,14 @@ diffCheck()
# ********************************************************************** # **********************************************************************
# main # main
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
datapath="../data" datapath="../data"
test_files="table.jpg smiley2.jpg ext.dat" test_files="table.jpg smiley2.jpg ext.dat"

22
test/iptctest.sh
Unescape Escape View File

@ -8,7 +8,7 @@ printTest()
good=$datapath/${src}.ipgd good=$datapath/${src}.ipgd
#run tests #run tests
$binpath/iptcprint $datapath/$src > $test $samples/iptcprint $datapath/$src > $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -26,7 +26,7 @@ removeTest()
cp $datapath/$src $tmp cp $datapath/$src $tmp
#run tests #run tests
$binpath/iptctest $tmp <<-eoc $samples/iptctest $tmp <<-eoc
r Iptc.Application2.Byline r Iptc.Application2.Byline
r Iptc.Application2.Caption r Iptc.Application2.Caption
r Iptc.Application2.Keywords r Iptc.Application2.Keywords
@ -34,7 +34,7 @@ removeTest()
r Iptc.Application2.Keywords r Iptc.Application2.Keywords
r Iptc.Application2.CountryName r Iptc.Application2.CountryName
eoc eoc
$binpath/iptcprint $tmp > $test $samples/iptcprint $tmp > $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -53,7 +53,7 @@ addModTest()
cp $datapath/$src $tmp cp $datapath/$src $tmp
#run tests #run tests
$binpath/iptctest $tmp <<-eoc $samples/iptctest $tmp <<-eoc
a Iptc.Application2.Headline The headline I am a Iptc.Application2.Headline The headline I am
a Iptc.Application2.Keywords Yet another keyword a Iptc.Application2.Keywords Yet another keyword
m Iptc.Application2.DateCreated 2004-8-3 m Iptc.Application2.DateCreated 2004-8-3
@ -63,7 +63,7 @@ addModTest()
a Iptc.Envelope.TimeSent 14:41:0-05:00 a Iptc.Envelope.TimeSent 14:41:0-05:00
a Iptc.Application2.RasterizedCaption 230 42 34 2 90 84 23 146 a Iptc.Application2.RasterizedCaption 230 42 34 2 90 84 23 146
eoc eoc
$binpath/iptcprint $tmp > $test $samples/iptcprint $tmp > $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -82,8 +82,8 @@ extendedTest()
cp $datapath/$src $tmp cp $datapath/$src $tmp
#run tests #run tests
$binpath/iptctest $tmp < $datapath/ext.dat $samples/iptctest $tmp < $datapath/ext.dat
$binpath/iptcprint $tmp > $test $samples/iptcprint $tmp > $test
#check results #check results
diffCheck $test $good diffCheck $test $good
@ -110,7 +110,13 @@ diffCheck()
# ********************************************************************** # **********************************************************************
# main # main
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
datapath="../data" datapath="../data"
diffargs="--strip-trailing-cr" diffargs="--strip-trailing-cr"
tmpfile=tmp/ttt tmpfile=tmp/ttt

15
test/modify-test.sh
Unescape Escape View File

@ -1,6 +1,13 @@
#! /bin/sh #! /bin/sh
# Test driver for write unit tests to build Exif metadata from scratch # Test driver for write unit tests to build Exif metadata from scratch
export LC_ALL=C export LC_ALL=C
if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
results="./tmp/modify-test.out" results="./tmp/modify-test.out"
good="./data/modify-test.out" good="./data/modify-test.out"
diffargs="--strip-trailing-cr" diffargs="--strip-trailing-cr"
@ -14,10 +21,10 @@ fi
cp -f ./data/exiv2-empty.jpg ./tmp cp -f ./data/exiv2-empty.jpg ./tmp
cp -f ./data/exiv2-gc.jpg ./tmp cp -f ./data/exiv2-gc.jpg ./tmp
cd ./tmp cd ./tmp
$VALGRIND exiv2 -v -m ../data/modifycmd1.txt exiv2-empty.jpg $bin/exiv2 -v -m ../data/modifycmd1.txt exiv2-empty.jpg
$VALGRIND exiv2 -v -m ../data/modifycmd2.txt exiv2-gc.jpg $bin/exiv2 -v -m ../data/modifycmd2.txt exiv2-gc.jpg
$VALGRIND exiv2 -v -pi exiv2-empty.jpg $bin/exiv2 -v -pi exiv2-empty.jpg
$VALGRIND exiv2 -v -pt exiv2-empty.jpg exiv2-gc.jpg $bin/exiv2 -v -pt exiv2-empty.jpg exiv2-gc.jpg
) > $results ) > $results

11
test/path-test.sh
Unescape Escape View File

@ -1,7 +1,12 @@
#! /bin/sh #! /bin/sh
# Mini test-driver for path utility functions # Mini test-driver for path utility functions
LD_LIBRARY_PATH=../../src:$LD_LIBRARY_PATH if [ -z "$EXIV2_BINDIR" ] ; then
binpath="$VALGRIND ../../src" bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cd ./tmp cd ./tmp
$binpath/path-test ../data/path-test.txt $bin/path-test ../data/path-test.txt

10
test/stringto-test.sh
Unescape Escape View File

@ -10,9 +10,15 @@ if [ $? -ne 0 ] ; then
diffargs="" diffargs=""
fi fi
( (
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cd ./tmp cd ./tmp
$binpath/stringto-test $samples/stringto-test
) > $results ) > $results
diff -q $diffargs $results $good diff -q $diffargs $results $good

11
test/tiff-test.sh
Unescape Escape View File

@ -16,8 +16,13 @@ good="./data/tiff-test.out"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Main routine # Main routine
( (
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
exiv2="$VALGRIND ../../src/exiv2" bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
cd ./tmp cd ./tmp
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@ -25,7 +30,7 @@ cd ./tmp
testfile=mini9.tif testfile=mini9.tif
cp -f ../data/$testfile . cp -f ../data/$testfile .
exifprobe $testfile exifprobe $testfile
$binpath/tiff-test $testfile $samples/tiff-test $testfile
exifprobe $testfile exifprobe $testfile
) > $results ) > $results

12
test/write-test.sh
Unescape Escape View File

@ -22,16 +22,22 @@ runTestCase()
rm -f $datapath/iii $datapath/ttt; rm -f $datapath/iii $datapath/ttt;
echo "------------------------------------------------------------" echo "------------------------------------------------------------"
$binpath/exifprint $rtc_infile > $datapath/iii; $samples/exifprint $rtc_infile > $datapath/iii;
cp $rtc_infile $rtc_outfile; cp $rtc_infile $rtc_outfile;
$binpath/write-test $rtc_infile $rtc_number > $datapath/ttt; $samples/write-test $rtc_infile $rtc_number > $datapath/ttt;
diff -a $datapath/iii $datapath/ttt diff -a $datapath/iii $datapath/ttt
} }
# ********************************************************************** # **********************************************************************
# main # main
binpath="$VALGRIND ../../samples" if [ -z "$EXIV2_BINDIR" ] ; then
bin="$VALGRIND ../../src"
samples="$VALGRIND ../../samples"
else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
datapath="." datapath="."
diffargs="--strip-trailing-cr" diffargs="--strip-trailing-cr"
tmpfile=tmp/ttt tmpfile=tmp/ttt

10
test/write2-test.sh
Unescape Escape View File

@ -10,10 +10,16 @@ if [ $? -ne 0 ] ; then
diffargs="" diffargs=""
fi fi
( (
binpath="$VALGRIND ../../samples" 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 cp -f ./data/exiv2-empty.jpg ./tmp
cd ./tmp cd ./tmp
$binpath/write2-test exiv2-empty.jpg $samples/write2-test exiv2-empty.jpg
) > $results ) > $results
diff -q $diffargs $results $good diff -q $diffargs $results $good

42
test/xmpparser-test.sh
Unescape Escape View File

@ -1,59 +1,63 @@
#! /bin/sh #! /bin/sh
# XMP parser test driver # XMP parser test driver
# ----------------------------------------------------------------------
# Setup
export LC_ALL=C
results="./xmpparser-test.out"
good="../data/xmpparser-test.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 # 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." echo "xmpparser-test not found. Assuming XMP support is not enabled."
exit 0 exit 0
fi fi
# ----------------------------------------------------------------------
# Setup
export LC_ALL=C
results="./tmp/xmpparser-test.out"
good="./data/xmpparser-test.out"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Main routine # Main routine
( (
binpath="$VALGRIND ../../samples"
exiv2="$VALGRIND exiv2"
cd ./tmp
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# BlueSquare # BlueSquare
testfile=BlueSquare.xmp testfile=BlueSquare.xmp
cp -f ../data/$testfile . cp -f ../data/$testfile .
$binpath/xmpparser-test $testfile $samples/xmpparser-test $testfile
diff $testfile ${testfile}-new diff $testfile ${testfile}-new
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# StaffPhotographer-Example # StaffPhotographer-Example
testfile=StaffPhotographer-Example.xmp testfile=StaffPhotographer-Example.xmp
cp -f ../data/$testfile . cp -f ../data/$testfile .
$binpath/xmpparser-test $testfile $samples/xmpparser-test $testfile
diff $testfile ${testfile}-new diff $testfile ${testfile}-new
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# xmpsdk # xmpsdk
testfile=xmpsdk.xmp testfile=xmpsdk.xmp
cp -f ../data/$testfile . cp -f ../data/$testfile .
$binpath/xmpparser-test $testfile $samples/xmpparser-test $testfile
diff $testfile ${testfile}-new diff $testfile ${testfile}-new
$binpath/xmpparse ${testfile} > t1 2>&1 $samples/xmpparse ${testfile} > t1 2>&1
$binpath/xmpparse ${testfile}-new > t2 2>&1 $samples/xmpparse ${testfile}-new > t2 2>&1
diff t1 t2 diff t1 t2
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# xmpsample # xmpsample
$binpath/xmpsample $samples/xmpsample
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# XMP sample commands # XMP sample commands
cp -f ../data/exiv2-empty.jpg . cp -f ../data/exiv2-empty.jpg .
$exiv2 -v -m ../data/cmdxmp.txt exiv2-empty.jpg $bin/exiv2 -v -m ../data/cmdxmp.txt exiv2-empty.jpg
$exiv2 -v -px exiv2-empty.jpg $bin/exiv2 -v -px exiv2-empty.jpg
) > $results 2>&1 ) > $results 2>&1

Write Preview
Loading…
Cancel
Save