Show More
@@ -97,17 +97,11 run_one() { | |||
|
97 | 97 | if diff -u "$OUTOK" "$OUT" > /dev/null; then |
|
98 | 98 | : no differences |
|
99 | 99 | else |
|
100 | if FIXME="`grep 'FIXME' \"$TESTDIR/$1\"`"; then | |
|
101 |
|
|
|
102 | echo "$1 failed, but this is ignored because of:" | |
|
103 | echo "$FIXME" | |
|
104 |
|
|
|
105 | cp "$OUT" "$ERR" | |
|
106 | echo | |
|
107 | echo "$1 output changed:" | |
|
108 | diff -u "$OUTOK" "$ERR" || true | |
|
109 | fail=1 | |
|
110 | fi | |
|
100 | cp "$OUT" "$ERR" | |
|
101 | echo | |
|
102 | echo "$1 output changed:" | |
|
103 | diff -u "$OUTOK" "$ERR" || true | |
|
104 | fail=1 | |
|
111 | 105 | fi |
|
112 | 106 | fi |
|
113 | 107 |
@@ -1,5 +1,4 | |||
|
1 | 1 | #!/bin/sh |
|
2 | # FIXME: This test may fail due to an uncritical bug in Mercurial. | |
|
3 | 2 | |
|
4 | 3 | mkdir t |
|
5 | 4 | cd t |
@@ -26,6 +26,7 3aa14bbc23d9 tip | |||
|
26 | 26 | + hg update |
|
27 | 27 | merging file1 |
|
28 | 28 | + hg diff |
|
29 | FIXME: This is a known bug: | |
|
29 | 30 | + hg status |
|
30 | 31 | + hg id |
|
31 | 32 | 3aa14bbc23d9 tip |
General Comments 0
You need to be logged in to leave comments.
Login now