diff --git a/ANNOUNCE b/ANNOUNCE index 8dd2b41d7..27b386033 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -467,6 +467,9 @@ Version 1.5.0beta57 [December 8, 2010] or warnings. Removed references to pngvcrd.c and pnggccrd.c from the vstudio project. Updated "libpng14" to "libpng15" in the visualc71 project. + Enabled the strip16 tests in pngvalid.` + Don't display test results (except PASS/FAIL) when running "make test". + Instead put them in pngtest-log.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index b89363bae..71e7fd435 100644 --- a/CHANGES +++ b/CHANGES @@ -3105,6 +3105,9 @@ Version 1.5.0beta57 [December 8, 2010] or warnings. Removed references to pngvcrd.c and pnggccrd.c from the vstudio project. Updated "libpng14" to "libpng15" in the visualc71 project. + Enabled the strip16 tests in pngvalid.` + Don't display test results (except PASS/FAIL) when running "make test". + Instead put them in pngtest-log.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/test-pngtest.sh b/test-pngtest.sh index c134a8a84..aeeccc641 100755 --- a/test-pngtest.sh +++ b/test-pngtest.sh @@ -1,3 +1,8 @@ #!/bin/sh -./pngtest ${srcdir}/pngtest.png +echo "Running tests. For details see pngtest-log.txt" + +echo "============ pngtest pngtest.png ==============" > pngtest-log.txt + +echo "Running test-pngtest.sh" +./pngtest ${srcdir}/pngtest.png >> pngtest-log.txt diff --git a/test-pngvalid-full.sh b/test-pngvalid-full.sh index 9f0f98707..4821241a5 100755 --- a/test-pngvalid-full.sh +++ b/test-pngvalid-full.sh @@ -2,6 +2,11 @@ # # Run a sequence of gamma tests quietly err=0 + +echo >> pngtest-log.txt +echo "============ pngvalid-full.sh ==============" >> pngtest-log.txt + +echo "Running test-pngvalid-full.sh -- it's lengthy, please wait..." for gamma in threshold transform sbit 16-to-8 do opts= @@ -10,13 +15,15 @@ do test "$gamma" = sbit || opts="$opts --nogamma-sbit" test "$gamma" = 16-to-8 || opts="$opts --nogamma-16-to-8" - if ./pngvalid -q --nostandard $opts + if ./pngvalid --nostandard $opts >> pngtest-log.txt then - echo "PASS:" pngvalid "(gamma-$gamma)" + echo " PASS:" pngvalid "(gamma-$gamma)" else - echo "FAIL:" pngvalid "(gamma-$gamma)" + echo " FAIL:" pngvalid "(gamma-$gamma)" err=1 fi done +echo + exit $err diff --git a/test-pngvalid-simple.sh b/test-pngvalid-simple.sh index c61bc31e2..ff98e3269 100755 --- a/test-pngvalid-simple.sh +++ b/test-pngvalid-simple.sh @@ -4,14 +4,17 @@ # gamma tests err=0 +echo >> pngtest-log.txt +echo "============ pngvalid-simple.sh ==============" >> pngtest-log.txt +echo "Running test-pngvalid-simple.sh" for opts in "" --progressive-read --interlace \ "--progressive-read --interlace" do - if ./pngvalid -q --nogamma $opts + if ./pngvalid --nogamma $opts >> pngtest-log.txt then - echo "PASS:" pngvalid --nogamma $opts + echo " PASS:" pngvalid --nogamma $opts else - echo "FAIL:" pngvalid --nogamma $opts + echo " FAIL:" pngvalid --nogamma $opts err=1 fi done