diff options
| author | Julian Andres Klode <jak@debian.org> | 2015-08-14 10:50:56 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2015-08-14 10:50:56 +0200 |
| commit | 51c4e07f4cba0615ff269b5a8d04dfd3d1313b00 (patch) | |
| tree | 40ce3c71671144c3d367d42c06a7dfa91eb8dc5e /test/integration/framework | |
| parent | dd14b7a562c54bb9ce551da1f8a80c78da5a4b6e (diff) | |
| parent | 14c50b58e938cf78ce2d32d4ec39979f7575c543 (diff) | |
Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian/experimental
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index 2efe7439e..b443f2a7b 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1377,8 +1377,17 @@ testsuccess() { if expr match "$1" '^apt.*' >/dev/null; then if grep -q -E ' runtime error: ' "$OUTPUT"; then msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@" - elif grep -q -E '^[WE]: ' "$OUTPUT"; then - msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@" + elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then + if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then + if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \ + | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then + msgpass + else + msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@" + fi + else + msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@" + fi else msgpass fi |