From b7aa754e0f83ad0bd60fe74f4a18c7ad7662cc91 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 17 Jun 2010 12:30:47 -0400
Subject: Slightly clearer trap statements.  All regression tests pass.

---
 regress-driver | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'regress-driver')

diff --git a/regress-driver b/regress-driver
index e571b108..793d909d 100755
--- a/regress-driver
+++ b/regress-driver
@@ -77,15 +77,16 @@ case $mode in
         echo "Testing the $testing..." >&2
         errors=0; total=0; notfound=0;
         for f in $*; do
-	    trap 'rm -f ${TMP}/test-$$.chk ${TMP}/testout-$$.chk ${TMP}/testin-$$.chk ${TMP}/diff-$$; exit $errors' EXIT HUP INT TERM
 	    if [ -r $f.chk ]
 	    then
+		trap 'rm -f ${TMP}/test-$$.chk; exit $errors' EXIT HUP INT TERM
 		case $testing in
 		daemon) gpsfake -s 38400 -1 -p $opts ${f} | ${GPSFILTER} ${ALTFILTER} >${TMP}/test-$$.chk ;;
 		clientlib) $GPSD_HOME/libgps -b <${f} >${TMP}/test-$$.chk ;;
 		esac
 		if [ "${ALTFILTER}" ]
 		then
+		    trap 'rm -f ${TMP}/test-$$.chk ${TMP}/testout-$$.chk ${TMP}/testin-$$.chk ${TMP}/diff-$$; exit $errors' EXIT HUP INT TERM
 		    sed -n <${f}.chk >${TMP}/testin-$$.chk ${ALTFILTER} -e 'p';
 		    sed -n <${TMP}/test-$$.chk >${TMP}/testout-$$.chk ${ALTFILTER} -e 'p';
 		    diff -ub ${TMP}/testin-$$.chk ${TMP}/testout-$$.chk >${TMP}/diff-$$;
-- 
cgit v1.2.1