projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change notes for 1.6
[zxing.git]
/
cpp
/
blackboxtest.sh
diff --git
a/cpp/blackboxtest.sh
b/cpp/blackboxtest.sh
index
b93fefe
..
b6be6d1
100755
(executable)
--- a/
cpp/blackboxtest.sh
+++ b/
cpp/blackboxtest.sh
@@
-2,14
+2,18
@@
blackboxpath="../core/test/data/blackbox"
blackboxpath="../core/test/data/blackbox"
-formats="ean13 ean8 upce upca qrcode"
+if [ "$*" != "" ]; then
+ formats="$*"
+else
+ formats="ean13 ean8 upce upca qrcode"
+fi
passed=0;
failed=0;
oldcat="";
for format in $formats; do
passed=0;
failed=0;
oldcat="";
for format in $formats; do
- for pic in `ls ${blackboxpath}/${format}-*/*.{jpg,JPG
} 2>/dev/null
`; do
+ for pic in `ls ${blackboxpath}/${format}-*/*.{jpg,JPG
,gif,GIF,png,PNG} 2>/dev/null | sort -n
`; do
category=${pic%/*};
category=${category##*/};
if [ "$oldcat" != "$category" ]; then
category=${pic%/*};
category=${category##*/};
if [ "$oldcat" != "$category" ]; then
@@
-19,8
+23,14
@@
for format in $formats; do
failed=0;
fi
echo -n "Processing: $pic ... "
failed=0;
fi
echo -n "Processing: $pic ... "
- tmp="${pic%JPG}";
- txt="${tmp%jpg}txt";
+ tmp="${pic}"
+ tmp="${tmp%JPG}";
+ tmp="${tmp%jpg}";
+ tmp="${tmp%gif}";
+ tmp="${tmp%GIF}";
+ tmp="${tmp%png}";
+ tmp="${tmp%PNG}";
+ txt="${tmp}txt";
expected=`cat "$txt"`;
actual=`build/zxing $pic`;
if [ "$expected" == "$actual" ]; then
expected=`cat "$txt"`;
actual=`build/zxing $pic`;
if [ "$expected" == "$actual" ]; then