[devel] Merge standard error with standard output from test scripts

This commit is contained in:
John Bowler 2010-12-08 20:33:39 -06:00 committed by Glenn Randers-Pehrson
parent d5e3590df7
commit 15c9be10b3
3 changed files with 3 additions and 3 deletions

View File

@ -5,4 +5,4 @@ echo "Running tests. For details see pngtest-log.txt"
echo "============ pngtest pngtest.png ==============" > pngtest-log.txt echo "============ pngtest pngtest.png ==============" > pngtest-log.txt
echo "Running test-pngtest.sh" echo "Running test-pngtest.sh"
./pngtest ${srcdir}/pngtest.png >> pngtest-log.txt ./pngtest ${srcdir}/pngtest.png >> pngtest-log.txt 2>&1

View File

@ -15,7 +15,7 @@ do
test "$gamma" = sbit || opts="$opts --nogamma-sbit" test "$gamma" = sbit || opts="$opts --nogamma-sbit"
test "$gamma" = 16-to-8 || opts="$opts --nogamma-16-to-8" test "$gamma" = 16-to-8 || opts="$opts --nogamma-16-to-8"
if ./pngvalid --nostandard $opts >> pngtest-log.txt if ./pngvalid --nostandard $opts >> pngtest-log.txt 2>&1
then then
echo " PASS:" pngvalid "(gamma-$gamma)" echo " PASS:" pngvalid "(gamma-$gamma)"
else else

View File

@ -10,7 +10,7 @@ echo "Running test-pngvalid-simple.sh"
for opts in "" --progressive-read --interlace \ for opts in "" --progressive-read --interlace \
"--progressive-read --interlace" "--progressive-read --interlace"
do do
if ./pngvalid --nogamma $opts >> pngtest-log.txt if ./pngvalid --nogamma $opts >> pngtest-log.txt 2>&1
then then
echo " PASS:" pngvalid --nogamma $opts echo " PASS:" pngvalid --nogamma $opts
else else