diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-24 23:00:57 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-24 23:00:57 +0100 |
| commit | 34f7c486b10559997849c15c6b51577ec3f96bc1 (patch) | |
| tree | 84a6a8c8a4c02c5d9b7d9fe1d52472c5e6eb7dec /test/integration/framework | |
| parent | 1aef66d5e150c608276fabdf1c2d2aaca9c45b7f (diff) | |
| parent | 2fd754cfe9a92fe85f4dd56447c70112b64b003e (diff) | |
Merge remote-tracking branch 'ajt/better-pdiffs-dk' into debian/sid
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index 6620c78dd..ca2f90050 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -951,11 +951,20 @@ testempty() { } testequal() { + local MSG='Test of equality of' + if [ "$1" = '--nomsg' ]; then + MSG='' + shift + fi + local COMPAREFILE=$(mktemp) addtrap "rm $COMPAREFILE;" echo "$1" > $COMPAREFILE shift - msgtest "Test for equality of" "$*" + + if [ -n "$MSG" ]; then + msgtest "$MSG" "$*" + fi $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail } |