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

More cleanup.

Browse Source
v0.27.3
Robin Mills 5 years ago
parent 4eeb5e2c21
commit e11900847e
8 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -14,7 +14,7 @@ source ./functions.source
echo set Exif.Canon.SerialNumber 1 echo set Exif.Canon.SerialNumber 1
echo add Exif.Canon.SerialNumber 2 echo add Exif.Canon.SerialNumber 2
echo set Exif.Photo.ISOSpeedRatings 155 echo set Exif.Photo.ISOSpeedRatings 155
echo set Exif.Photo.DateTimeOriginal 2007:11:11 09:10:11 # echo set Exif.Photo.DateTimeOriginal 2007:11:11 09:10:11 # See #1219
) > $cmdfile ) > $cmdfile
copyTestFile $crwfile copyTestFile $crwfile
@ -31,13 +31,7 @@ source ./functions.source
) 3>&1 > $results ) 3>&1 > $results
printf "\n" reportTest
# ----------------------------------------------------------------------
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

3
test/data/crw-test.out
Unescape Escape View File

@ -72,7 +72,6 @@ Set Exif.Canon.FirmwareVersion "Whatever version" (Ascii)
Set Exif.Canon.SerialNumber "1" (Long) Set Exif.Canon.SerialNumber "1" (Long)
Add Exif.Canon.SerialNumber "2" (Long) Add Exif.Canon.SerialNumber "2" (Long)
Set Exif.Photo.ISOSpeedRatings "155" (Short) Set Exif.Photo.ISOSpeedRatings "155" (Short)
Set Exif.Photo.DateTimeOriginal "2007:11:11 09:10:11" (Ascii)
File 1/1: exiv2-canon-powershot-s40.crw File 1/1: exiv2-canon-powershot-s40.crw
Exif.Thumbnail.Compression Short 1 JPEG (old-style) Exif.Thumbnail.Compression Short 1 JPEG (old-style)
Exif.Thumbnail.JPEGInterchangeFormat Long 1 0 Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
@ -81,7 +80,7 @@ Exif.Photo.PixelXDimension Long 1 2272
Exif.Photo.PixelYDimension Long 1 1704 Exif.Photo.PixelYDimension Long 1 1704
Exif.Image.Orientation Short 1 top, left Exif.Image.Orientation Short 1 top, left
Exif.Canon.FileNumber Long 1 130-3050 Exif.Canon.FileNumber Long 1 130-3050
Exif.Photo.DateTimeOriginal Ascii 20 2007:11:11 09:10:11 Exif.Photo.DateTimeOriginal Ascii 20 2005:04:23 17:54:36
Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image Exif.Canon.ImageType Ascii 30 CRW:High definition CCD image
Exif.Canon.OwnerName Ascii 16 Different owner Exif.Canon.OwnerName Ascii 16 Different owner
Exif.Image.Make Ascii 6 Canon Exif.Image.Make Ascii 6 Canon

14
test/functions.source
Unescape Escape View File

@ -85,10 +85,7 @@ copyTestFiles()
reportTest() reportTest()
{ {
cat $results | tr '\\' '/' > ${results}-new cat $results | tr '\\' '/' > ${results}-new
mv -f ${results}-new $results mv -f ${results}-new $results
if [ ! -z `which dos2unix` ]; then
dos2unix $results >/dev/null 2>&1
fi
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
lhs=$results lhs=$results
@ -104,17 +101,10 @@ reportTest()
fi fi
fi fi
if [ "$PLATFORM" == "cygwin" ]; then diff $diffargs $lhs $rhs
diff $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
else
diff $diffargs $lhs $rhs
fi
rc=$? rc=$?
if [ $rc -eq 0 ] ; then if [ $rc -eq 0 ] ; then
echo "all testcases passed." echo "all testcases passed."
else
diff $diffargs $lhs $rhs
exit 3
fi fi
} }

8
test/geotag-test.sh
Unescape Escape View File

@ -24,13 +24,7 @@ source ./functions.source
) 3>&1 > $results 2>&1 ) 3>&1 > $results 2>&1
printf "\n" reportTest
# ----------------------------------------------------------------------
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

8
test/icc-test.sh
Unescape Escape View File

@ -57,13 +57,7 @@ test1120() # --comment and -dc clobbered by writing ICC/JPG
) 3>&1 > $results 2>&1 ) 3>&1 > $results 2>&1
printf "\n" reportTest
# ----------------------------------------------------------------------
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

6
test/stdin-test.sh
Unescape Escape View File

@ -49,11 +49,7 @@ source ./functions.source
printf "\n" printf "\n"
# ---------------------------------------------------------------------- reportTest
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

8
test/webp-test.sh
Unescape Escape View File

@ -80,13 +80,7 @@ source ./functions.source
) 3>&1 > $results 2>&1 ) 3>&1 > $results 2>&1
printf "\n" reportTest
# ----------------------------------------------------------------------
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

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

@ -41,11 +41,7 @@ fi
) > $results 2>&1 ) > $results 2>&1
# ---------------------------------------------------------------------- reportTest
# Evaluate results
cat $results | tr -d $'\r' > $results-stripped
mv $results-stripped $results
reportTest $results $good
# That's all Folks! # That's all Folks!
## ##

Write Preview
Loading…
Cancel
Save