More cleanup.
This commit is contained in:
parent
4eeb5e2c21
commit
e11900847e
@ -14,7 +14,7 @@ source ./functions.source
|
||||
echo set Exif.Canon.SerialNumber 1
|
||||
echo add Exif.Canon.SerialNumber 2
|
||||
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
|
||||
|
||||
copyTestFile $crwfile
|
||||
@ -31,13 +31,7 @@ source ./functions.source
|
||||
|
||||
) 3>&1 > $results
|
||||
|
||||
printf "\n"
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
@ -72,7 +72,6 @@ Set Exif.Canon.FirmwareVersion "Whatever version" (Ascii)
|
||||
Set Exif.Canon.SerialNumber "1" (Long)
|
||||
Add Exif.Canon.SerialNumber "2" (Long)
|
||||
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
|
||||
Exif.Thumbnail.Compression Short 1 JPEG (old-style)
|
||||
Exif.Thumbnail.JPEGInterchangeFormat Long 1 0
|
||||
@ -81,7 +80,7 @@ Exif.Photo.PixelXDimension Long 1 2272
|
||||
Exif.Photo.PixelYDimension Long 1 1704
|
||||
Exif.Image.Orientation Short 1 top, left
|
||||
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.OwnerName Ascii 16 Different owner
|
||||
Exif.Image.Make Ascii 6 Canon
|
||||
|
||||
@ -85,10 +85,7 @@ copyTestFiles()
|
||||
reportTest()
|
||||
{
|
||||
cat $results | tr '\\' '/' > ${results}-new
|
||||
mv -f ${results}-new $results
|
||||
if [ ! -z `which dos2unix` ]; then
|
||||
dos2unix $results >/dev/null 2>&1
|
||||
fi
|
||||
mv -f ${results}-new $results
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
lhs=$results
|
||||
@ -104,17 +101,10 @@ reportTest()
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$PLATFORM" == "cygwin" ]; then
|
||||
diff $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
|
||||
else
|
||||
diff $diffargs $lhs $rhs
|
||||
fi
|
||||
diff $diffargs $lhs $rhs
|
||||
rc=$?
|
||||
if [ $rc -eq 0 ] ; then
|
||||
echo "all testcases passed."
|
||||
else
|
||||
diff $diffargs $lhs $rhs
|
||||
exit 3
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -24,13 +24,7 @@ source ./functions.source
|
||||
|
||||
) 3>&1 > $results 2>&1
|
||||
|
||||
printf "\n"
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
@ -57,13 +57,7 @@ test1120() # --comment and -dc clobbered by writing ICC/JPG
|
||||
|
||||
) 3>&1 > $results 2>&1
|
||||
|
||||
printf "\n"
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
@ -49,11 +49,7 @@ source ./functions.source
|
||||
|
||||
printf "\n"
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
@ -80,13 +80,7 @@ source ./functions.source
|
||||
|
||||
) 3>&1 > $results 2>&1
|
||||
|
||||
printf "\n"
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
@ -41,11 +41,7 @@ fi
|
||||
|
||||
) > $results 2>&1
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Evaluate results
|
||||
cat $results | tr -d $'\r' > $results-stripped
|
||||
mv $results-stripped $results
|
||||
reportTest $results $good
|
||||
reportTest
|
||||
|
||||
# That's all Folks!
|
||||
##
|
||||
|
||||
Loading…
Reference in New Issue
Block a user