From 0cc2135303677a9d57d209adeaa5e11c5fc89e8c Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 17 Feb 2009 18:11:44 +0000 Subject: [PATCH] experimental web page for quickly eyballing the rtest differences --- rtest/rtest.sh | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/rtest/rtest.sh b/rtest/rtest.sh index cdedda5db..264fe7e94 100755 --- a/rtest/rtest.sh +++ b/rtest/rtest.sh @@ -24,6 +24,7 @@ fi TESTFILE=tests.txt # Test specifications GRAPHDIR=graphs # Directory of input graphs and data OUTDIR=ndata # Directory for test output +OUTHTML=nhtml # Directory for html test report REFDIR=nshare # Directory for expected test output GENERATE= # If set, generate test data VERBOSE= # If set, give verbose output @@ -150,23 +151,43 @@ function doDiff awk -f strps.awk $FILE1 > $TMPFILE1 awk -f strps.awk $FILE2 > $TMPFILE2 diff -q $TMPFILE2 $TMPFILE1 > /dev/null + if [[ $? != 0 ]] + then + print -u 2 "Test $1:$2 : == Failed == $OUTFILE" + fi ;; svg ) sed '/^$/d' > $TMPFILE1 sed '/^$/d' > $TMPFILE2 diff -q $TMPFILE2 $TMPFILE1 > /dev/null + if [[ $? != 0 ]] + then + print -u 2 "Test $1:$2 : == Failed == $OUTFILE" + fi ;; png ) - $DIFFIMG $FILE2 $FILE1 > /dev/null + $DIFFIMG $FILE2 $FILE1 >$OUTHTML/dif_$OUTFILE + if [[ $? != 0 ]] + then + echo "

" >>$OUTHTML/index.html + cp $FILE2 $OUTHTML/old_$OUTFILE + echo "" >>$OUTHTML/index.html + cp $FILE1 $OUTHTML/new_$OUTFILE + echo "" >>$OUTHTML/index.html + echo "" >>$OUTHTML/index.html + print -u 2 "Test $1:$2 : == Failed == $OUTFILE" + else + rm $OUTHTML/dif_$OUTFILE + fi ;; * ) diff -q $FILE2 $FILE1 > /dev/null + if [[ $? != 0 ]] + then + print -u 2 "Test $1:$2 : == Failed == $OUTFILE" + fi ;; esac - if [[ $? != 0 ]] - then - print -u 2 "Test $1:$2 : == Failed == $OUTFILE" - fi } # Generate output file name given 3 parameters. @@ -330,6 +351,12 @@ then mkdir $OUTDIR fi +if [[ ! -d "$OUTHTML" ]] +then + mkdir $OUTHTML +fi +rm -f $OUTHTML/* + if [[ ! -x $DOT ]] then print -u 2 "$DOT program is not executable" -- 2.50.1