Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14599/tests
Modified Files:
check-1054322.sh check-1054323.sh check-994706.sh
Log Message:
Made the tests work in non-English locales
Index: check-994706.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-994706.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-994706.sh 12 Dec 2008 07:14:38 -0000 1.1
+++ check-994706.sh 10 Jan 2009 08:57:42 -0000 1.2
@@ -6,11 +6,11 @@ dstimg="./${bug}.jpg.modified.jpeg"
# Remove Maker Note
echo "Removing EXIF Maker Note"
-"$EXIFEXE" "--ifd=EXIF" "--tag=Maker Note" --remove --output "$dstimg" "$srcimg" > /dev/null 2>&1
+"$EXIFEXE" "--ifd=EXIF" "--tag=MakerNote" --remove --output "$dstimg" "$srcimg" > /dev/null 2>&1
# List all tags
-"$EXIFEXE" --list-tags "$srcimg" | sed '1d' > "./check-${bug}.src.txt"
-"$EXIFEXE" --list-tags "$dstimg" | sed '1d' > "./check-${bug}.dst.txt"
+env LANG=C LANGUAGE=C "$EXIFEXE" --list-tags "$srcimg" | sed '1d' > "./check-${bug}.src.txt"
+env LANG=C LANGUAGE=C "$EXIFEXE" --list-tags "$dstimg" | sed '1d' > "./check-${bug}.dst.txt"
# Find different tags in source and destination image
"$DIFFEXE" -u "./check-${bug}.src.txt" "./check-${bug}.dst.txt" > "./check-${bug}.a.patch"
@@ -25,4 +25,7 @@ s="$?"
if test "$s" -ne 0; then
echo "The Maker Note should have been removed. Bad."
fi
+
+rm -f "$dstimg" "./check-${bug}.src.txt" "./check-${bug}.dst.txt" "./check-${bug}.a.xpatch" "./check-${bug}.b.xpatch"
+
exit "$s"
Index: check-1054322.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054322.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-1054322.sh 12 Dec 2008 07:14:38 -0000 1.1
+++ check-1054322.sh 10 Jan 2009 08:57:42 -0000 1.2
@@ -1,7 +1,7 @@
#!/bin/sh
. check-vars.sh
result_file="result-1054322-1.tmp"
-"$EXIFEXE" --remove-thumbnail --output ./1054322-1.out.jpg "$SRCDIR"/1054322.jpg > ${result_file} 2>&1
+env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054322-1.out.jpg "$SRCDIR"/1054322.jpg > ${result_file} 2>&1
result="`cat ${result_file}`"
s="$?"
echo "$result"
@@ -16,7 +16,7 @@ else
fi
result_file="result-1054322-2.tmp"
-"$EXIFEXE" --remove-thumbnail --output ./1054323-2.out.jpg ./this-file-does-not-exist.jpg > ${result_file} 2>&1
+env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054323-2.out.jpg ./this-file-does-not-exist.jpg > ${result_file} 2>&1
result="`cat ${result_file}`"
s="$?"
echo "$result"
Index: check-1054323.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054323.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-1054323.sh 23 Dec 2008 08:50:23 -0000 1.2
+++ check-1054323.sh 10 Jan 2009 08:57:42 -0000 1.3
@@ -3,3 +3,6 @@
set -x
# -d flag turns a Corrupt Data error into a warning
"$EXIFEXE" -d -r -o ./1054323.out.jpg "$SRCDIR"/1054323.jpg >/dev/null
+s="$?"
+rm -f ./1054323.out.jpg
+exit "$s"
|
