# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2005-08-04 17:13:17
# Node ID ad8ff3534fde94b8e13b7086426aa357a3ddba0f
# Parent  b65773f7db4161aaa7340ecd32d69e0dacac4d9a

Removed special FIXME handling in run-tests, added bug info to .out files.


diff --git a/tests/run-tests b/tests/run-tests
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -97,17 +97,11 @@ run_one() {
 	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
 
diff --git a/tests/test-merge-revert b/tests/test-merge-revert
--- a/tests/test-merge-revert
+++ b/tests/test-merge-revert
@@ -1,5 +1,4 @@
 #!/bin/sh
-# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t
diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out
--- a/tests/test-merge-revert.out
+++ b/tests/test-merge-revert.out
@@ -26,6 +26,7 @@ 3aa14bbc23d9 tip
 + hg update
 merging file1
 + hg diff
+FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip
diff --git a/tests/test-merge-revert2 b/tests/test-merge-revert2
--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -1,5 +1,4 @@
 #!/bin/sh
-# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t
diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -44,6 +44,7 @@ M file1
 3aa14bbc23d9+ tip
 + hg revert
 + hg diff
+FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip