Add option to avoid noise from the baton in batch-mode testing.

2 files changed, 6 insertions, 3 deletions

diff --git a/gpsfake b/gpsfake
index bcfe7f46..8be191d7 100755
--- a/gpsfake
+++ b/gpsfake
@@ -138,6 +138,8 @@ def fakehook(linenumber, fakegps):
 
 if progress:
     baton = Baton("Processing %s" % logfile, "done")
+else:
+    print >>sys.stderr, "Processing %s" % logfile
 
 test = gpsfake.TestSession(prefix=monitor, port=port, options=doptions, verbose=verbose, predump=predump)
 
diff --git a/regress-driver b/regress-driver
index b50feb70..9fb3b79a 100755
--- a/regress-driver
+++ b/regress-driver
@@ -8,10 +8,11 @@ PATH=.:$PATH
 export PATH
 
 mode=regress
-while getopts trbvo:n opt
+while getopts strbvo:n opt
 do
     case $opt in
-	t) mode=regress ;;	# Run regression tests
+	s) mode=regress ;;	# Run regression tests
+	t) opts="-b $opts" mode=regress ;;	# Run regression tests w/baton
 	r) mode=superraw ;;	# Run superraw regressions (r=2 mode)
 	b) mode=build ;;	# Rebuild regression check files
 	v) mode=view ;;		# View result of generating a check file
@@ -29,7 +30,7 @@ case $mode in
             dir=`dirname $f`
 	    if [ -r $f.chk ]
 	    then
-		$do gpsfake -s 38400 -1 -b -p $opts ${f} | grep -v "^GPSD,X" >$dir/test.chk;
+		$do gpsfake -s 38400 -1 -p $opts ${f} | grep -v "^GPSD,X" >$dir/test.chk;
 		if $do diff -ub ${f}.chk $dir/test.chk; then :; else
 		    errors=`expr $errors + 1`;
 		fi;