Update of /cvsroot/libexif/libexif-testsuite/tests In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31042 Modified Files: check-1054321.sh check-1054322.sh check-1054323.sh check-1169170.sh check-994706.sh check-add-tags.sh check-all-mandatory-tags.sh check-bid37022.sh check-create-tags.sh check-exif-executable.sh check-fixup.sh check-general-images.sh check-init-mandatory-tags.sh check-mnote-count.sh check-no-unknown-tags.sh check-readwrite-identity.sh check-remove-tags.sh check-tag-description.sh check-write-fail.sh Log Message: Specify explicit path to ./check-vars.sh to improve script portability Index: check-add-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-add-tags.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-add-tags.sh 24 Nov 2009 05:31:31 -0000 1.1 +++ check-add-tags.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -4,7 +4,7 @@ # data types as possible are included. Data inputs with extra spaces, # plus and minus signs are tested. -. check-vars.sh +. ./check-vars.sh srcimg="add-tag-src.out.jpg" dstimg="add-tag.out.jpg" Index: check-1054322.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054322.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- check-1054322.sh 10 Jan 2009 09:02:54 -0000 1.3 +++ check-1054322.sh 15 Dec 2010 08:19:51 -0000 1.4 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh result_file="result-1054322-1.tmp" env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054322-1.out.jpg "$SRCDIR"/1054322.jpg > ${result_file} 2>&1 result="`cat ${result_file}`" Index: check-no-unknown-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-no-unknown-tags.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- check-no-unknown-tags.sh 17 Dec 2009 07:09:58 -0000 1.3 +++ check-no-unknown-tags.sh 15 Dec 2010 08:19:51 -0000 1.4 @@ -2,7 +2,7 @@ # Run all test images through exif and ensure that all the tags are known. # This is as much a test of the images as of exif itself. -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" Index: check-tag-description.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-tag-description.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- check-tag-description.sh 18 Mar 2010 22:43:56 -0000 1.6 +++ check-tag-description.sh 15 Dec 2010 08:19:51 -0000 1.7 @@ -3,7 +3,7 @@ # tags, especially those that test some potential boundary conditions # of the lookup routines. -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" # clear out the output file Index: check-init-mandatory-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-init-mandatory-tags.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-init-mandatory-tags.sh 7 Oct 2010 04:27:27 -0000 1.1 +++ check-init-mandatory-tags.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -3,7 +3,7 @@ # TODO: add the other mandatory values for all image types -. check-vars.sh +. ./check-vars.sh dstimg="init.out.jpg" srcimg="$SRCDIR/images/no-exif.jpg" Index: check-1054321.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054321.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- check-1054321.sh 19 Nov 2009 00:32:57 -0000 1.2 +++ check-1054321.sh 15 Dec 2010 08:19:51 -0000 1.3 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh result_file="result-1054321.tmp" #set -x "$EXIFEXE" -m -o ./1054321.out.jpg "$SRCDIR"/1054321.jpg > "$result_file" 2>&1 Index: check-general-images.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-general-images.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- check-general-images.sh 13 Jan 2009 22:31:46 -0000 1.4 +++ check-general-images.sh 15 Dec 2010 08:19:51 -0000 1.5 @@ -2,7 +2,7 @@ # Execute a number of common sense checks on "real" images # (not specially prepared images) -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" tmpimg="./general.out.jpg" Index: check-exif-executable.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-exif-executable.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-exif-executable.sh 12 Dec 2008 07:14:38 -0000 1.1 +++ check-exif-executable.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh if test -x "$EXIFEXE"; then echo "exif executable \`$EXIFEXE\' is executable. Good." ls -l "$EXIFEXE" Index: check-mnote-count.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-mnote-count.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-mnote-count.sh 8 Oct 2010 05:22:04 -0000 1.1 +++ check-mnote-count.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/sh # Count the number of MakerNotes that can be parsed -. check-vars.sh +. ./check-vars.sh # Run this in the C locale so the messages are known export LANG=C Index: check-remove-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-remove-tags.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-remove-tags.sh 24 Nov 2009 05:31:31 -0000 1.1 +++ check-remove-tags.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -3,7 +3,7 @@ # Tags within each sub-IFD are tested. Boundary conditions such as removing # all tags within a sub-IFD, and all tags in file are also tested. -. check-vars.sh +. ./check-vars.sh originalimg="$SRCDIR/images/canon-powershot-g2-001.jpg" srcimg="remove-tag-src.out.jpg" Index: check-bid37022.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-bid37022.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- check-bid37022.sh 7 Oct 2010 04:27:27 -0000 1.2 +++ check-bid37022.sh 15 Dec 2010 08:19:51 -0000 1.3 @@ -5,7 +5,7 @@ # always cause a crash, but a malloc library which checks heap consistency # should catch it (such as glibc does when linked with -lmcheck, or valgrind). # This bug is also known as CVE-2009-3895 -. check-vars.sh +. ./check-vars.sh bug="bid37022" srcimg="$SRCDIR/${bug}.jpg" Index: check-readwrite-identity.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-readwrite-identity.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- check-readwrite-identity.sh 18 Mar 2010 20:44:51 -0000 1.5 +++ check-readwrite-identity.sh 15 Dec 2010 08:19:51 -0000 1.6 @@ -2,7 +2,7 @@ # Read then write (unmodified) each image through exif. # Check that the written image contains the same data as the original. -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" tmpfile2="./output2.tmp" Index: check-1054323.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054323.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- check-1054323.sh 10 Jan 2009 08:57:42 -0000 1.3 +++ check-1054323.sh 15 Dec 2010 08:19:51 -0000 1.4 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh set -x # -d flag turns a Corrupt Data error into a warning "$EXIFEXE" -d -r -o ./1054323.out.jpg "$SRCDIR"/1054323.jpg >/dev/null Index: check-all-mandatory-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-all-mandatory-tags.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- check-all-mandatory-tags.sh 18 Mar 2010 20:44:51 -0000 1.2 +++ check-all-mandatory-tags.sh 15 Dec 2010 08:19:51 -0000 1.3 @@ -2,7 +2,7 @@ # Run all test images through exif and ensure that all the mandatory tags are # available -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" Index: check-create-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-create-tags.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- check-create-tags.sh 20 Nov 2010 08:32:29 -0000 1.2 +++ check-create-tags.sh 15 Dec 2010 08:19:51 -0000 1.3 @@ -3,7 +3,7 @@ # Checks that the expected tags are created, and that the --no-fixup option # creates no tags, just an empty EXIF structure. -. check-vars.sh +. ./check-vars.sh dstimg="./create-tags.out.jpg" Index: check-994706.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-994706.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- check-994706.sh 21 Nov 2009 23:57:38 -0000 1.5 +++ check-994706.sh 15 Dec 2010 08:19:51 -0000 1.6 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh bug="994706" srcimg="$SRCDIR/images/canon-powershot-g2-001.jpg" dstimg="./${bug}.jpg.out.jpg" Index: check-1169170.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1169170.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-1169170.sh 12 Dec 2008 07:14:38 -0000 1.1 +++ check-1169170.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -1,5 +1,5 @@ #!/bin/sh -. check-vars.sh +. ./check-vars.sh if "$EXIFEXE" "$SRCDIR/images/canon-powershot-a400-001.jpg" > /dev/null 2>&1; then echo "This should have failed." exit 1 Index: check-write-fail.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-write-fail.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-write-fail.sh 7 Oct 2010 04:27:27 -0000 1.1 +++ check-write-fail.sh 15 Dec 2010 08:19:51 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/sh # Check that exif properly detects an unwritable file -. check-vars.sh +. ./check-vars.sh tmpfile="./output.tmp" Index: check-fixup.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-fixup.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- check-fixup.sh 14 Dec 2010 08:15:44 -0000 1.3 +++ check-fixup.sh 15 Dec 2010 08:19:51 -0000 1.4 @@ -4,7 +4,7 @@ # incorrect, data types, which are converted into the correct data types # by libexif. -. check-vars.sh +. ./check-vars.sh srcimg="$SRCDIR/wrong-format.jpg" dstimg="./fixup.out.jpg" |