We can now declare a test requiring gdb interaction, based on tests/guest-debug/run-test.py.
Reviewed-by: Manos Pitsidianakis <[email protected]> Tested-by: Alex Bennée <[email protected]> Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/meson.build | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 3714fe4dc0d..76375615d0b 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -5,6 +5,7 @@ if config_host.has_key('GDB') gdb_progs = [config_host['GDB'], gdb_progs] endif gdb = find_program(gdb_progs, required: false) +prog_gdb_test = find_program('../guest-debug/run-test.py') tcg_tests = {} # tcg_tests is a dictionary with following structure: @@ -22,6 +23,7 @@ tcg_tests = {} # 'test_name': ['provide an alternative test name'], # 'cflags': ['additional cflags to compile test', ...], # 'qemu_args': ['qemu command line flags', ...], +# 'gdb_test': ['gdb test args'], # 'env_var': ['VAR=value', ...], # 'plugin_test': { # 'plugin': 'plugin_name', @@ -83,7 +85,7 @@ foreach target, plan: tcg_tests foreach src, setup: t # return a clear error if user misspell a setup entry foreach key, _ : setup - allowed = ['exe_name', 'env_var', 'cflags', 'plugin_test', + allowed = ['exe_name', 'env_var', 'cflags', 'gdb_test', 'plugin_test', 'qemu_args', 'test_name'] if key not in allowed error('unknown tcg setup entry \'' + key + '\' for test ' + src + @@ -102,6 +104,10 @@ foreach target, plan: tcg_tests endforeach endif + if 'gdb_test' in setup and gdb_arch not in gdb_arch_supported + continue + endif + if 'plugin_test' in setup and not get_option('plugins') continue endif @@ -118,7 +124,9 @@ foreach target, plan: tcg_tests if 'test_name' in setup test_name = setup['test_name'] endif - if 'plugin_test' in setup + if 'gdb_test' in setup + test_name = 'gdb-' + test_name + elif 'plugin_test' in setup plugin = test_plugins[setup['plugin_test']['plugin']] # remove 'lib' prefix plugin_name = fs.stem(plugin).substring(3) @@ -182,6 +190,16 @@ foreach target, plan: tcg_tests exe = built_tests[exe_name] cmd = [qemu, qemu_args, exe] + if 'gdb_test' in setup + cmd = [prog_gdb_test, + '--gdb', gdb, + '--qemu', qemu, + '--qargs', ' '.join(qemu_args), + '--bin', exe, + setup['gdb_test'], + ] + endif + # some tests expect QEMU env var to be set cmd = ['QEMU=' + qemu.full_path(), cmd] -- 2.47.3
