--- a/tests/run-tests	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/run-tests	Thu Aug 04 13:27:41 2005 -0800
@@ -27,11 +27,11 @@
 HGTMP=""
 cleanup_exit() {
     rm -rf "$HGTMP"
-    exit $1
 }
 
 # Remove temporary files even if we get interrupted
-trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
 HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
 (umask 077 && mkdir "$HGTMP") || {
@@ -61,7 +61,7 @@
     chmod 755 "$INST/bin/hg"
 else
     cat tests/install.err
-    cleanup_exit 1
+    exit 1
 fi
 cd "$TESTDIR"
 
@@ -97,17 +97,11 @@
 	if diff -u "$OUTOK" "$OUT" > /dev/null; then
 	    : no differences
 	else
-	    if FIXME="`grep 'FIXME' \"$TESTDIR/$1\"`"; then
-		echo
-		echo "$1 failed, but this is ignored because of:"
-		echo "$FIXME"
-	    else
-		cp "$OUT" "$ERR"
-		echo
-		echo "$1 output changed:"
-		diff -u "$OUTOK" "$ERR" || true
-		fail=1
-	    fi
+	    cp "$OUT" "$ERR"
+	    echo
+	    echo "$1 output changed:"
+	    diff -u "$OUTOK" "$ERR" || true
+	    fail=1
 	fi
     fi
 
@@ -132,6 +126,6 @@
 echo "Ran $tests tests, $failed failed."
 
 if [ $failed -gt 0 ] ; then
-    cleanup_exit 1
+    exit 1
 fi
-cleanup_exit 0
+exit 0