OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/decode: Suppress "error: " string for expected-failure tests

Browse Source 
The "expected failure" tests for decodetree result in the
error messages from decodetree ending up in logs and in
V=1 output:

>>> MALLOC_PERTURB_=226 /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/pyvenv/bin/python3 /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/scripts/decodetree.py --output-null --test-for-error /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/../../tests/decode/err_argset1.decode
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/../../tests/decode/err_argset1.decode:5: error: duplicate argument "a"
―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
 1/44 qemu:decodetree / err_argset1                OK              0.05s

This then produces false positives when scanning the
logfiles for strings like "error: ".

For the expected-failure tests, make decodetree print
"detected:" instead of "error:".

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230720131521.1325905-1-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2023-07-25 10:56:52 +01:00
parent 9b579543d7
commit 78cc90346e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/decodetree.py
View File

@ -134,6 +134,10 @@ def error_with_file(file, lineno, *args):
global output_file global output_file
global output_fd global output_fd
# For the test suite expected-errors case, don't print the
# string "error: ", so they don't turn up as false positives
# if you grep the meson logs for strings like that.
end = 'error: ' if not testforerror else 'detected: '
prefix = '' prefix = ''
if file: if file:
prefix += f'{file}:' prefix += f'{file}:'
@ -141,7 +145,7 @@ def error_with_file(file, lineno, *args):
prefix += f'{lineno}:' prefix += f'{lineno}:'
if prefix: if prefix:
prefix += ' ' prefix += ' '
print(prefix, end='error: ', file=sys.stderr) print(prefix, end=end, file=sys.stderr)
print(*args, file=sys.stderr) print(*args, file=sys.stderr)
if output_file and output_fd: if output_file and output_fd: