third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.27-maintenance' into http_iotest_0.27

Browse Source
This commit is contained in:
Robin Mills
2020-05-14 21:09:40 +01:00
committed by GitHub
parent cc4d56dec1 de4d305d2a
commit 7e55f5d5be
46 changed files with 638 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile
+23 -41
View File
@@ -72,29 +72,24 @@ SVN = svn://dev.exiv2.org/svn/testdata/trunk
##
# Add test drivers to this list
TESTS1 = addmoddel.sh \
TESTS = addmoddel.sh \
conversions.sh \
exifdata-test.sh \
exiv2-test.sh \
geotag-test.sh \
icc-test.sh \
iso65k-test.sh \
modify-test.sh \
path-test.sh \
stringto-test.sh \
webp-test.sh \
write2-test.sh \
# the following tests are broken on UNIX
# You can manually run all the tests: `cd <exiv2dir>/test ; env EXIV2_BINDIR=$PWD/../build/bin make test`
# You can manually run a single test: `cd <exiv2dir>/test ; env EXIV2_BINDIR=$PWD/../build/bin ./iotest.sh`
# Or: make iotest
TESTS2 = exifdata-test.sh \
exiv2-test.sh \
imagetest.sh \
iotest.sh \
iptctest.sh \
iso65k-test.sh \
modify-test.sh \
path-test.sh \
preview-test.sh \
stringto-test.sh \
tiff-test.sh \
webp-test.sh \
write-test.sh \
write2-test.sh \
xmpparser-test.sh
# video tests
@@ -136,30 +131,29 @@ xmpparser-test:
version_test \
unit_test :
@echo
@echo ---- Running $@ ----
@echo
-@./$@.sh
bash_tests:
-@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \
-@./$@.sh ; \
else \
make alltest ; \
fi
tests:
-@if [ -e $$EXIV2_BINDIR/../Makefile ]; then \
-@./$@.sh ; \
else \
make unit_test ; make alltest ; make python_tests ; make version_test ; \
make unit_test ; \
make bash_tests ; \
make python_tests ; \
make version_test ; \
fi
alltest:
bash_tests:
@echo
@echo ---- Running bash tests: ALL ----
@echo ---- Running bash_tests ----
@echo
mkdir -p tmp
@mkdir -p tmp
@rm -rf tmp/test-failed
@list='$(TESTS1) $(TESTS2)'; for p in $$list; do \
@list='$(TESTS)'; for p in $$list; do \
echo Running $$p ...; \
./$$p; \
rc=$$?; \
@@ -168,25 +162,13 @@ alltest:
done
@if [ -e tmp/test-failed ]; then echo ; echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi
unixtest:
@echo
@echo ---- Running bash tests: UNIX subset ----
@echo
mkdir -p tmp
@rm -rf tmp/test-failed
@list='$(TESTS1)'; for p in $$list; do \
echo Running $$p ...; \
./$$p; \
rc=$$?; \
if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \
if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \
done
@if [ -e tmp/test-failed ]; then echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi
python_tests:
@echo
@echo ---- Running python_tests ----
@echo
-( cd ../tests ; if [ ! -z $$VERBOSE ]; then verbose=--verbose ;fi ; python3 runner.py $$verbose )
testv:
@for t in /video ; do \
if [ ! -e data/$$t ]; then \
test/conversions.sh
+1 -1
View File
@@ -69,7 +69,7 @@ fi
grep x-default l.xmp
copyTestFile $IMG l.jpg
runTest exiv2 -iX l.jpg
runTest exiv2 -px l.jpg
runTest exiv2 -px -b l.jpg
runTest exiv2 -PEkycv l.jpg
runTest exiv2 -pi l.jpg
test/data/conversions.out
+3 -3
View File
@@ -42,9 +42,9 @@ Iptc.Application2.Caption String 20 How to fix this mess
Testcase 6
==========
Exif.Image.ExifTag Long 1 26
Exif.Photo.UserComment Undefined 59 charset="Jis" This is a JIS encoded Exif user comment. Or was it?
Exif.Photo.UserComment Undefined 59 charset=Jis This is a JIS encoded Exif user comment. Or was it?
Xmp.exif.UserComment LangAlt 1 lang="x-default" This is a JIS encoded Exif user comment. Or was it?
Exif.Photo.UserComment Undefined 110 charset="Unicode" This is a JIS encoded Exif user comment. Or was it?
Exif.Photo.UserComment Undefined 110 charset=Unicode This is a JIS encoded Exif user comment. Or was it?
File 1/1: m.xmp
m.xmp: No IPTC data found in the file
@@ -52,7 +52,7 @@ Testcase 7
==========
Xmp.exif.UserComment LangAlt 1 lang="x-default" This is a JIS encoded Exif user comment. Or was it?
Exif.Image.ExifTag Long 1 26
Exif.Photo.UserComment Undefined 110 charset="Unicode" This is a JIS encoded Exif user comment. Or was it?
Exif.Photo.UserComment Undefined 110 charset=Unicode This is a JIS encoded Exif user comment. Or was it?
File 1/1: n.jpg
n.jpg: No IPTC data found in the file
test/data/exifdata-test.out
+8 -8
View File
@@ -267,7 +267,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1
Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328
Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0
Exif.Photo.UserComment 0x9286 Exif Undefined 264
Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment
Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272
@@ -396,7 +396,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1
Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328
Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0
Exif.Photo.UserComment 0x9286 Exif Undefined 264
Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment
Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272
@@ -526,7 +526,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1
Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328
Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0
Exif.Photo.UserComment 0x9286 Exif Undefined 264
Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment
Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272
@@ -656,7 +656,7 @@ Exif.Canon.FileNumber 0x0008 Makernote Long 1
Exif.Canon.OwnerName 0x0009 Makernote Ascii 32 Andreas Huggel
Exif.Canon.ModelID 0x0010 Makernote Long 1 17891328
Exif.Canon.CameraInfo 0x000d Makernote Short 21 42 3 32769 378 32769 0 0 0 259 2 0 10 0 0 0 57 198 5 0 0 0
Exif.Photo.UserComment 0x9286 Exif Undefined 264
Exif.Photo.UserComment 0x9286 Exif Undefined 264 binary comment
Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4 48 49 48 48
Exif.Photo.ColorSpace 0xa001 Exif Short 1 1
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 2272
@@ -819,7 +819,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3
Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL
Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL
Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii"
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii
Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00
Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00
Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00
@@ -990,7 +990,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3
Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL
Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL
Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii"
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii
Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00
Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00
Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00
@@ -1162,7 +1162,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3
Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL
Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL
Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii"
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii
Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00
Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00
Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00
@@ -1334,7 +1334,7 @@ Exif.NikonFl1.0x0011 0x0011 Makernote Byte 3
Exif.Nikon3.ImageOptimization 0x00a9 Makernote Ascii 16 NORMAL
Exif.Nikon3.Saturation 0x00aa Makernote Ascii 16 NORMAL
Exif.Nikon3.VariProgram 0x00ab Makernote Ascii 16
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset="Ascii"
Exif.Photo.UserComment 0x9286 Exif Undefined 44 charset=Ascii
Exif.Photo.SubSecTime 0x9290 Exif Ascii 3 00
Exif.Photo.SubSecTimeOriginal 0x9291 Exif Ascii 3 00
Exif.Photo.SubSecTimeDigitized 0x9292 Exif Ascii 3 00
test/data/exiv2-test.out
+36 -36
View File
File diff suppressed because one or more lines are too long
test/data/geotag-test.out
+1 -1
View File
@@ -8,7 +8,7 @@ Exif.GPSInfo.GPSAltitudeRef Byte 1 Below sea level
Exif.GPSInfo.GPSAltitude Rational 1 14.3 m
Exif.GPSInfo.GPSTimeStamp Rational 3 09:54:28
Exif.GPSInfo.GPSMapDatum Ascii 7 WGS-84
Exif.GPSInfo.GPSProcessingMethod Undefined 18 HYBRID-FIX
Exif.GPSInfo.GPSProcessingMethod Undefined 18 charset=Ascii HYBRID-FIX
Exif.GPSInfo.GPSDateStamp Ascii 20 2008:05:08 09:54:28
--- deleting the GPSInfo tags
--- run geotag ---
test/data/modify-test.out
+1 -1
View File
@@ -18,7 +18,7 @@ exiv2-empty.jpg Exif.Image.DateTime Ascii 19
exiv2-empty.jpg Exif.Image.Artist Ascii 17 Vincent van Gogh
exiv2-empty.jpg Exif.Image.WhitePoint Short 5 32 12 4 5 6
exiv2-empty.jpg Exif.Image.ExifTag Long 1 110
exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 This is an ASCII Exif comment
exiv2-empty.jpg Exif.Photo.UserComment Undefined 37 charset=Ascii This is an ASCII Exif comment
File 2/2: exiv2-gc.jpg
exiv2-gc.jpg Exif.Image.ImageDescription Ascii 18 Exif JPEG
exiv2-gc.jpg Exif.Image.Make Ascii 8 Camera
test/data/preview-test.out
+326
View File
@@ -0,0 +1,326 @@
-----> exiv2-bug443.jpg <-----
Command: exiv2 -pp exiv2-bug443.jpg
Preview 1: image/jpeg, 288x192 pixels, 33779 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug443.jpg
Exit code: 0
-----> exiv2-bug444.jpg <-----
Command: exiv2 -pp exiv2-bug444.jpg
Preview 1: image/jpeg, 160x120 pixels, 4158 bytes
Preview 2: image/jpeg, 320x240 pixels, 16993 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug444.jpg
Exit code: 0
-----> exiv2-bug445.jpg <-----
Command: exiv2 -pp exiv2-bug445.jpg
Preview 1: image/jpeg, 160x120 pixels, 5448 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug445.jpg
Exit code: 0
-----> exiv2-bug447.jpg <-----
Command: exiv2 -pp exiv2-bug447.jpg
Preview 1: image/jpeg, 160x120 pixels, 4093 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug447.jpg
Exit code: 0
-----> exiv2-bug501.jpg <-----
Command: exiv2 -pp exiv2-bug501.jpg
Preview 1: image/jpeg, 120x160 pixels, 6179 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug501.jpg
Exit code: 0
-----> exiv2-bug528.jpg <-----
Command: exiv2 -pp exiv2-bug528.jpg
Preview 1: image/jpeg, 160x94 pixels, 4492 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-bug528.jpg
Exit code: 0
-----> exiv2-canon-eos-20d.jpg <-----
Command: exiv2 -pp exiv2-canon-eos-20d.jpg
Preview 1: image/jpeg, 160x120 pixels, 6260 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-canon-eos-20d.jpg
Exit code: 0
-----> exiv2-canon-eos-300d.jpg <-----
Command: exiv2 -pp exiv2-canon-eos-300d.jpg
Preview 1: image/jpeg, 160x120 pixels, 9728 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-canon-eos-300d.jpg
Exit code: 0
-----> exiv2-canon-eos-d30.jpg <-----
Command: exiv2 -pp exiv2-canon-eos-d30.jpg
Preview 1: image/jpeg, 160x120 pixels, 13824 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-canon-eos-d30.jpg
Exit code: 0
-----> exiv2-canon-powershot-a520.jpg <-----
Command: exiv2 -pp exiv2-canon-powershot-a520.jpg
Preview 1: image/jpeg, 160x120 pixels, 6137 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-canon-powershot-a520.jpg
Exit code: 0
-----> exiv2-canon-powershot-s40.crw <-----
Command: exiv2 -pp exiv2-canon-powershot-s40.crw
Preview 1: image/jpeg, 160x120 pixels, 4418 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-canon-powershot-s40.crw
Exit code: 0
-----> exiv2-fujifilm-finepix-s2pro.jpg <-----
Command: exiv2 -pp exiv2-fujifilm-finepix-s2pro.jpg
Preview 1: image/jpeg, 160x120 pixels, 9573 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-fujifilm-finepix-s2pro.jpg
Exit code: 0
-----> exiv2-gc.jpg <-----
Command: exiv2 -pp exiv2-gc.jpg
Preview 1: image/jpeg, 133x200 pixels, 6144 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-gc.jpg
Exit code: 0
-----> exiv2-kodak-dc210.jpg <-----
Command: exiv2 -pp exiv2-kodak-dc210.jpg
Preview 1: image/tiff, 96x72 pixels, 20916 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-kodak-dc210.jpg
Exit code: 0
-----> exiv2-nikon-d70.jpg <-----
Command: exiv2 -pp exiv2-nikon-d70.jpg
Preview 1: image/jpeg, 160x120 pixels, 8930 bytes
Preview 2: image/jpeg, 564x372 pixels, 27773 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-nikon-d70.jpg
Exit code: 0
-----> exiv2-nikon-e950.jpg <-----
Command: exiv2 -pp exiv2-nikon-e950.jpg
Preview 1: image/jpeg, 160x120 pixels, 4662 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-nikon-e950.jpg
Exit code: 0
-----> exiv2-nikon-e990.jpg <-----
Command: exiv2 -pp exiv2-nikon-e990.jpg
Preview 1: image/jpeg, 160x120 pixels, 7829 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-nikon-e990.jpg
Exit code: 0
-----> exiv2-olympus-c8080wz.jpg <-----
Command: exiv2 -pp exiv2-olympus-c8080wz.jpg
Preview 1: image/jpeg, 160x120 pixels, 7306 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-olympus-c8080wz.jpg
Exit code: 0
-----> exiv2-panasonic-dmc-fz5.jpg <-----
Command: exiv2 -pp exiv2-panasonic-dmc-fz5.jpg
Preview 1: image/jpeg, 160x120 pixels, 10308 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-panasonic-dmc-fz5.jpg
Exit code: 0
-----> exiv2-photoshop.psd <-----
Command: exiv2 -pp exiv2-photoshop.psd
Preview 1: image/jpeg, 150x91 pixels, 4669 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-photoshop.psd
Exit code: 0
-----> exiv2-pre-in-xmp.xmp <-----
Command: exiv2 -pp exiv2-pre-in-xmp.xmp
Preview 1: image/jpeg, 150x91 pixels, 4745 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-pre-in-xmp.xmp
Exit code: 0
-----> exiv2-sigma-d10.jpg <-----
Command: exiv2 -pp exiv2-sigma-d10.jpg
Preview 1: image/jpeg, 160x106 pixels, 11998 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-sigma-d10.jpg
Exit code: 0
-----> exiv2-sony-dsc-w7.jpg <-----
Command: exiv2 -pp exiv2-sony-dsc-w7.jpg
Preview 1: image/jpeg, 160x120 pixels, 15605 bytes
Exit code: 0
Command: exiv2 -f -ep exiv2-sony-dsc-w7.jpg
Exit code: 0
-----> glider.exv <-----
Command: exiv2 -pp glider.exv
Preview 1: image/jpeg, 160x120 pixels, 5333 bytes
Exit code: 0
Command: exiv2 -f -ep glider.exv
Exit code: 0
-----> imagemagick.pgf <-----
Command: exiv2 -pp imagemagick.pgf
Preview 1: image/jpeg, 160x105 pixels, 4363 bytes
Exit code: 0
Command: exiv2 -f -ep imagemagick.pgf
Exit code: 0
-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
Exit code: 0
-----> iptc-psAPP13-noIPTC.jpg <-----
Command: exiv2 -pp iptc-psAPP13-noIPTC.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-noIPTC.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCbeg.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCbeg.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCbeg.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCempty.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCempty.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCend.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCend.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCend.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCmid.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCmid.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid.jpg
Exit code: 0
-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
Preview 1: image/jpeg, 160x114 pixels, 938 bytes
Exit code: 0
Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
Exit code: 0
-----> smiley2.jpg <-----
Command: exiv2 -pp smiley2.jpg
Preview 1: image/jpeg, 160x120 pixels, 7289 bytes
Exit code: 0
Command: exiv2 -f -ep smiley2.jpg
Exit code: 0
test/exiv2-test.sh
+6 -2
View File
@@ -2,7 +2,11 @@
# Test driver for exiv2 utility tests
source ./functions.source
diffargs="-w --text $diffargs"
if [ "$PLATFORM" == SunOS -o "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ] ; then
diffargs="-w $diffargs"
else
diffargs="-w --text $diffargs"
fi
( cd "$testdir"
@@ -66,7 +70,7 @@ diffargs="-w --text $diffargs"
echo
echo "Exiv2 version ------------------------------------------------------------"
# Tweak this to avoid a maintenance headache with test/data/exiv2-test.out
runTest exiv2 -u -V | sed -E -e 's#^exiv2.*$#exiv2 0.27.0.0 (__ bit build)#'
runTest exiv2 -u -V | sed -e 's#^exiv2.*$#exiv2 0.27.0.0 (__ bit build)#'
echo
echo "Exiv2 help ---------------------------------------------------------------"
runTest exiv2 -u -h
test/functions.source
+2 -1
View File
@@ -139,7 +139,7 @@ runTestCase()
runTest exifprint $rtc_infile > iii;
cp $rtc_infile $rtc_outfile;
runTest write-test $rtc_infile $rtc_number > ttt;
diff -a iii ttt
diff $diffargs iii ttt
}
##
@@ -527,6 +527,7 @@ prepareTest()
# figure out arguments for diff
good="$here/data/${this}.out"
results="$here/tmp/${this}.out"
mkdir -p $here/tmp
tmpfile=$here/tmp/$this
echo '' >> $tmpfile
test/preview-test.sh
+8 -11
View File
@@ -55,7 +55,7 @@ source ./functions.source
echo
echo "Command: exiv2 -pp $filename"
runTest exiv2 -pp "$filename"
runTest exiv2 -pp "$filename" 2>/dev/null
exitcode=$?
echo "Exit code: $exitcode"
@@ -63,25 +63,22 @@ source ./functions.source
echo
echo "Command: exiv2 -f -ep $filename"
runTest exiv2 -f -ep "$filename"
runTest exiv2 -f -ep "$filename" 2>/dev/null
echo "Exit code: $?"
runTest exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."*
if [ $(uname) == SunOS ]; then
bdiff "../data/preview/$image-preview$preview."* "$image-preview$preview."*
else
diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."*
fi
done
done
) 3>&1 > "$testdir/preview-test.out" 2>&1
echo "."
# ----------------------------------------------------------------------
# Result
if ! diff -q $diffargs "$testdir/$datadir/preview/preview-test.out" "$testdir/preview-test.out" ; then
diff -u $diffargs "$testdir/$datadir/preview/preview-test.out" "$testdir/preview-test.out"
exit 1
fi
echo "All testcases passed."
reportTest
# That's all Folks!
##
test/tiff-test.sh
+10 -10
View File
@@ -21,10 +21,10 @@ exifprobe()
lens=()
vals=()
while read line; do
tag=$(echo $line|cut -d. -f 3 | cut -d' ' -f 1) ; tags+=($tag)
typ=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 1 ); typs+=($typ)
len=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 2 ); lens+=($len)
val=$(echo $line|cut -d' ' -f 2- | sed -E -e 's/ +/ /g' -e 's/^ //' | cut -d' ' -f 3-); vals+=("$val")
tag=$(echo $line|cut -f 3 -d. | cut -f 1 -d' ' ) ; tags+=($tag)
typ=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 1 -d' ' ); typs+=($typ)
len=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 2 -d' ' ); lens+=($len)
val=$(echo $line|cut -f 2- -d' ' | sed -e 's/ +/ /g' -e 's/^ //' | cut -f 3- -d' ' ); vals+=("$val")
done < <( runTest exiv2 -pa $f 2>/dev/null ) # process pipe
count=${#tags[@]}
@@ -51,13 +51,13 @@ exifprobe()
while read line; do
k=$((k+1)) # skip the first couple of lines
if [ $k -gt 2 ]; then
TAG=$(echo $line| cut -d'|' -f 2 | cut -d' ' -f 3 ); TAGS+=($TAG);
TYP=$(echo $line| cut -d'|' -f 3 | sed -E -e's/ +//g'); TYPS+=($TYP)
LEN=$(echo $line| cut -d'|' -f 4 | sed -E -e's/ +//g'); LENS+=($LEN)
OFF=$(echo $line| cut -d'|' -f 5 | sed -E -e's/ +//g'); OFFS+=($OFF)
VAL=$(echo $line| cut -d'|' -f 6- | sed -e's/^ //' ); VALS+=($"$VAL")
TAG=$(echo $line| cut -f 2 -d'|' | cut -f 3 -d' ' ); TAGS+=($TAG);
TYP=$(echo $line| cut -f 3 -d'|' | sed -e's/ +//g' ); TYPS+=($TYP)
LEN=$(echo $line| cut -f 4 -d'|' | sed -e's/ +//g' ); LENS+=($LEN)
OFF=$(echo $line| cut -f 5 -d'|' | sed -e's/ +//g' ); OFFS+=($OFF)
VAL=$(echo $line| cut -f 6- -d'|' | sed -e's/^ //' ); VALS+=($"$VAL")
fi
done < <( runTest exiv2 -pS $f | grep -v -e '^END' 2>/dev/null )
done < <( runTest exiv2 -pS $f | grep -v '^END' 2>/dev/null )
COUNT=${#TAGS[@]}
echo ''
test/unit_test.sh
+2 -2
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Test driver for exiv2.exe --verbose --version
# driver for $ make unit_test
( source ./functions.source ; runTest unit_tests --gtest_color=no | grep -v "Warning: Unsupported date format")
( source ./functions.source ; runTest unit_tests --gtest_color=no 2>&1 | grep -v "Warning: Unsupported .... format" )
# That's all Folks!
##
test/xmpparser-test.sh
+4
View File
@@ -2,6 +2,10 @@
# XMP parser test driver
source ./functions.source
if [ "$PLATFORM" == "SunOS" ]; then
echo "platform $PLATFORM Skip $0"
exit 0 # SunOS diff complains about newline stuff
fi
##
# Check if xmpparser-test exists