From ce3c7330badb03e780b53bea280e3223fe31b5e2 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 4 Feb 2012 07:35:34 -0600
Subject: [PATCH] [libpng16] Revised test-pngstest.sh to report PASS/FAIL for
 each image.

---
 ANNOUNCE         |  1 +
 CHANGES          |  2 ++
 test-pngstest.sh | 30 ++++++++++++------------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 2abf68e82..e800a2d19 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -177,6 +177,7 @@ Version 1.6.0beta10 [February 3, 2012]
 
 Version 1.6.0beta11 [February 4, 2012]
   Fix character count in pngstest command in projects/owatcom/pngstest.tgt
+  Revised test-pngstest.sh to report PASS/FAIL for each image.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 95ddcae1c..413f1ec69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3925,9 +3925,11 @@ Version 1.6.0beta10 [February 3, 2012]
   Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests
   Updated list of test images in CMakeLists.txt
   Updated the prebuilt configure files to current condition.
+  Revised INSTALL information about autogen.sh; it works in tar distributions.
 
 Version 1.6.0beta11 [February 4, 2012]
   Fix character count in pngstest command in projects/owatcom/pngstest.tgt
+  Revised test-pngstest.sh to report PASS/FAIL for each image.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/test-pngstest.sh b/test-pngstest.sh
index 7b1f4ccc5..c91a7b84b 100755
--- a/test-pngstest.sh
+++ b/test-pngstest.sh
@@ -6,25 +6,19 @@ err=0
 echo >> pngtest-log.txt
 echo "============ pngstest.sh ==============" >> pngtest-log.txt
 
-echo "Running test-pngstest.sh on contrib/pngsuite/*.png"
-for opts in ""
+echo "Running test-pngstest.sh"
+for image in ${srcdir}/contrib/pngsuite/*.png
 do
-   if ./pngstest --log "$@" $opts ${srcdir}/contrib/pngsuite/bas*.png \
-      >>pngtest-log.txt 2>&1
-   then
-      echo "  PASS: pngstest $opts (basic images)"
-   else
-      echo "  FAIL: pngstest $opts (basic images)"
-      err=1
-   fi
-   if ./pngstest --log "$@" $opts ${srcdir}/contrib/pngsuite/ft*.png \
-      >>pngtest-log.txt 2>&1
-   then
-      echo "  PASS: pngstest $opts (transparent images)"
-   else
-      echo "  FAIL: pngstest $opts (transparent images)"
-      err=1
-   fi
+   for opts in ""
+   do
+      if ./pngstest --log "$@" $opts $image >>pngtest-log.txt 2>&1
+      then
+         echo "  PASS: pngstest $opts $image"
+      else
+         echo "  FAIL: pngstest $opts $image"
+         err=1
+      fi
+   done
 done
    
 exit $err