Show More
@@ -60,9 +60,9 b' then' | |||
|
60 | 60 | rm tests/install.err |
|
61 | 61 | mv "$INST/bin/hg" "$INST/bin/hg.real" |
|
62 | 62 | ( |
|
63 |
|
|
|
64 |
|
|
|
65 |
|
|
|
63 | echo '#!/bin/sh' | |
|
64 | echo 'echo "+ hg $@"' | |
|
65 | echo 'exec hg.real "$@"' | |
|
66 | 66 | ) > "$INST/bin/hg" |
|
67 | 67 | chmod 755 "$INST/bin/hg" |
|
68 | 68 | else |
@@ -87,7 +87,7 b' run_one() {' | |||
|
87 | 87 | ERR="$TESTDIR/$1.err" |
|
88 | 88 | |
|
89 | 89 | if "$TESTDIR/$1" > "$OUT" 2>&1; then |
|
90 |
|
|
|
90 | : no error | |
|
91 | 91 | else |
|
92 | 92 | echo "$1 failed with error code $?" |
|
93 | 93 | fail=1 |
@@ -100,21 +100,21 b' run_one() {' | |||
|
100 | 100 | cat "$ERR" |
|
101 | 101 | fail=1 |
|
102 | 102 | elif [ -r "$OUTOK" ]; then |
|
103 |
|
|
|
104 |
|
|
|
105 | else | |
|
106 |
|
|
|
107 | echo | |
|
108 |
|
|
|
109 | echo "$FIXME" | |
|
110 |
|
|
|
111 |
|
|
|
112 | echo | |
|
113 |
|
|
|
114 |
|
|
|
115 | fail=1 | |
|
116 | fi | |
|
117 | fi | |
|
103 | if diff -u "$OUTOK" "$OUT" > /dev/null; then | |
|
104 | : no differences | |
|
105 | else | |
|
106 | if FIXME="`grep 'FIXME' \"$TESTDIR/$1\"`"; then | |
|
107 | echo | |
|
108 | echo "$1 failed, but this is ignored because of:" | |
|
109 | echo "$FIXME" | |
|
110 | else | |
|
111 | cp "$OUT" "$ERR" | |
|
112 | echo | |
|
113 | echo "$1 output changed:" | |
|
114 | diff -u "$OUTOK" "$ERR" || true | |
|
115 | fail=1 | |
|
116 | fi | |
|
117 | fi | |
|
118 | 118 | fi |
|
119 | 119 | |
|
120 | 120 | cd "$TESTDIR" |
General Comments 0
You need to be logged in to leave comments.
Login now