Mercurial > hg > mercurial-crew-with-dirclash
changeset 833:ad8ff3534fde
Removed special FIXME handling in run-tests, added bug info to .out files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 18:13:17 +0100 |
parents | b65773f7db41 |
children | 78a9f95766dc |
files | tests/run-tests tests/test-merge-revert tests/test-merge-revert.out tests/test-merge-revert2 tests/test-merge-revert2.out |
diffstat | 5 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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