diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index af8bf176..20a10da6 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -182,7 +182,7 @@ $bin/exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing $bin/exiv2 -u -v -PEkyct $filename # Test easy-access keys (using a dummy bug number) -if { test -f "$samples/easyaccess-test" || test -f "$samples/easyaccess-test.exe"; }; then +if { test -f $samples/easyaccess-test || test -f $samples/easyaccess-test.exe; }; then num=726 filename=exiv2-bug$num.jpg cp -f ../data/exiv2-empty.jpg $filename diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index 0e50d1c1..a0be5055 100644 Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 245a0a08..771e421a 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -672,7 +672,7 @@ File 2/15: 20031214_000043.jpg 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 +20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.63 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -2285,7 +2285,7 @@ Compare image data and extracted data ------------------------------------ < 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 < 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.63 < 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s < 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -3826,7 +3826,7 @@ Compare image data and extracted data ------------------------------------ > 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54 > 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.62 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.63 > 20031214_000043.exv Exif.CanonSi.TargetAperture Short 1 F5 > 20031214_000043.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s > 20031214_000043.exv Exif.CanonSi.0x0006 Short 1 0 @@ -5587,7 +5587,7 @@ Compare original and inserted image data --------------------------------- < 20031214_000043.jpg Exif.CanonSi.0x0000 Short 1 54 < 20031214_000043.jpg Exif.CanonSi.0x0001 Short 1 0 < 20031214_000043.jpg Exif.CanonSi.ISOSpeed Short 1 100 -< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.62 +< 20031214_000043.jpg Exif.CanonSi.MeasuredEV Short 1 13.63 < 20031214_000043.jpg Exif.CanonSi.TargetAperture Short 1 F5 < 20031214_000043.jpg Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s < 20031214_000043.jpg Exif.CanonSi.0x0006 Short 1 0 @@ -7128,7 +7128,7 @@ Compare original and inserted image data --------------------------------- > 20031214_000043.exv Exif.CanonSi.0x0000 Short 1 54 > 20031214_000043.exv Exif.CanonSi.0x0001 Short 1 0 > 20031214_000043.exv Exif.CanonSi.ISOSpeed Short 1 100 -> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.62 +> 20031214_000043.exv Exif.CanonSi.MeasuredEV Short 1 13.63 > 20031214_000043.exv Exif.CanonSi.TargetAperture Short 1 F5 > 20031214_000043.exv Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s > 20031214_000043.exv Exif.CanonSi.0x0006 Short 1 0 diff --git a/test/path-test.sh b/test/path-test.sh index a7386d64..be009921 100755 --- a/test/path-test.sh +++ b/test/path-test.sh @@ -9,7 +9,7 @@ else fi cd ./tmp -if { test -f "$bin/path-test" || test -f "$bin/path-test.exe"; }; then +if { test -f $bin/path-test || test -f $bin/path-test.exe; }; then $bin/path-test ../data/path-test.txt else echo "path-test.sh: path-test executable not found. Skipping path tests."