Mercurial > hg-stable

changeset 802:69db1e34378b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow tests for not yet fixed bugs to fail without generating error diff.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:59:10 +0100
parents 1f9ec150a476
children 3d47e7fc33a3
files tests/run-tests tests/test-merge-revert tests/test-merge-revert2
diffstat 3 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests	Fri Jul 29 15:21:02 2005 +0100
+++ b/tests/run-tests	Fri Jul 29 15:59:10 2005 +0100
@@ -103,11 +103,17 @@
         if diff -u "$OUTOK" "$OUT" > /dev/null; then
             : no differences
         else
-            cp "$OUT" "$ERR"
-            echo
-            echo "$1 output changed:"
-            diff -u "$OUTOK" "$ERR" || true
-            fail=1
+            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
         fi
     fi
 
--- a/tests/test-merge-revert	Fri Jul 29 15:21:02 2005 +0100
+++ b/tests/test-merge-revert	Fri Jul 29 15:59:10 2005 +0100
@@ -1,4 +1,5 @@
 #!/bin/sh
+# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t
--- a/tests/test-merge-revert2	Fri Jul 29 15:21:02 2005 +0100
+++ b/tests/test-merge-revert2	Fri Jul 29 15:59:10 2005 +0100
@@ -1,4 +1,5 @@
 #!/bin/sh
+# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t