From: Martin Mares <mj@ucw.cz>
Date: Sun, 18 Nov 2007 17:15:44 +0000 (+0100)
Subject: Better formatting of pedant output. EV_PEDANT can also set pedant's options.
X-Git-Tag: python-dummy-working~274
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e87fab526bcdadb80727bda0b84dd28b9934fa2c;p=moe.git

Better formatting of pedant output. EV_PEDANT can also set pedant's options.
---

diff --git a/bin/lib b/bin/lib
index bbe3beb..9c49f9e 100644
--- a/bin/lib
+++ b/bin/lib
@@ -268,7 +268,15 @@ function test-prolog
 	esac
 	if [ -n "$EV_PEDANT" -a $IN_TYPE != none ] ; then
 		pcont "<pedant> "
-		bin/pedant <$TDIR/$TEST.in | tr '\n' ' ' >&2
+		if [ "$EV_PEDANT" = 1 ] ; then
+			EV_PEDANT=" "
+		fi
+		bin/pedant <$TDIR/$TEST.in >$TDIR/$TEST.pedant $EV_PEDANT
+		if [ -s $TDIR/$TEST.pedant ] ; then
+			pend
+			sed 's/^/\t/' <$TDIR/$TEST.pedant >&2
+			pstart -e '\t'
+		fi
 	fi
 	case $OUT_TYPE in
 		file)	echo "Output file: $PROBLEM.out"
diff --git a/config b/config
index e7a1f2b..3f87032 100644
--- a/config
+++ b/config
@@ -142,7 +142,7 @@ FREE_PASCAL_RTE=1
 # DEBUG: Let `ev' run sample tests, too.
 #EV_SAMPLE=1
 
-# DEBUG: Run `pedant' on all input data
+# DEBUG: Run `pedant' on all input data. Set either to `1' or to pedant's options.
 #EV_PEDANT=1
 
 # DEBUG: Skip checks (useful when generating output files by running model solution)