X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cpp%2Fblackboxtest.sh;h=b6be6d142894fe87ecde1005853292bf0d0956c0;hb=7d5a7a2cd5b4d694a69145afe550981bc8e0be94;hp=0aba8cda85a16cfa40ac2064955279683b2e1a05;hpb=305aa7b260184b41bc3a43d101fcd1835335e825;p=zxing.git

diff --git a/cpp/blackboxtest.sh b/cpp/blackboxtest.sh
index 0aba8cda..b6be6d14 100755
--- a/cpp/blackboxtest.sh
+++ b/cpp/blackboxtest.sh
@@ -2,14 +2,18 @@
 
 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
-	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
@@ -19,10 +23,16 @@ for format in $formats; do
 			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`;
+		actual=`build/zxing $pic`;
 		if [ "$expected" == "$actual" ]; then
 			echo "passed."
 			passed=$((passed+1));