From 9bb003463cb670149df1260db253bc10c6c16d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 27 Jun 2023 20:22:28 +0200 Subject: [PATCH] test-tool: Rename perf-tool The original purpose of the tool was to collect performance data that would optionally be uploaded to a server in Owen's living room. While the corresponding scripts are still included (although the server was probably dismantled years ago), the tool is mainly used for running gnome-shell with scripted tests nowadays. Rename the tool to reflect that. Part-of: --- ...-perf-tool.in => gnome-shell-test-tool.in} | 0 src/meson.build | 6 ++-- tests/meson.build | 32 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) rename src/{gnome-shell-perf-tool.in => gnome-shell-test-tool.in} (100%) diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-test-tool.in similarity index 100% rename from src/gnome-shell-perf-tool.in rename to src/gnome-shell-test-tool.in diff --git a/src/meson.build b/src/meson.build index 4f8820747..7ede16f45 100644 --- a/src/meson.build +++ b/src/meson.build @@ -18,9 +18,9 @@ script_data.set('pkglibdir', pkglibdir) script_data.set('PYTHON', python.full_path()) script_data.set('VERSION', meson.project_version()) -perf_tool = configure_file( - input: 'gnome-shell-perf-tool.in', - output: 'gnome-shell-perf-tool', +test_tool = configure_file( + input: 'gnome-shell-test-tool.in', + output: 'gnome-shell-test-tool', configuration: script_data, install_dir: bindir ) diff --git a/tests/meson.build b/tests/meson.build index 5d52d80fd..f2ccf0aa7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -35,7 +35,7 @@ foreach test : tests workdir: meson.current_source_dir()) endforeach -perf_tests = [ +shell_tests = [ { 'name': 'basic', }, @@ -53,28 +53,28 @@ libgvc_path = fs.parent(libgvc.get_variable('libgvc').full_path()) background_file = files(join_paths('data', 'background.png')) -perf_testenv = environment() -perf_testenv.set('G_DEBUG', 'fatal-warnings') -perf_testenv.set('G_MESSAGES_DEBUG', 'GNOME Shell') -perf_testenv.set('GNOME_SHELL_DATADIR', data_builddir) -perf_testenv.set('GNOME_SHELL_BUILDDIR', src_builddir) -perf_testenv.set('GNOME_SHELL_SESSION_MODE', 'user') -perf_testenv.set('SHELL_BACKGROUND_IMAGE', '@0@'.format(background_file)) -perf_testenv.append('GI_TYPELIB_PATH', gvc_typelib_path, separator: ':') -perf_testenv.append('LD_LIBRARY_PATH', libgvc_path, separator: ':') +shell_testenv = environment() +shell_testenv.set('G_DEBUG', 'fatal-warnings') +shell_testenv.set('G_MESSAGES_DEBUG', 'GNOME Shell') +shell_testenv.set('GNOME_SHELL_DATADIR', data_builddir) +shell_testenv.set('GNOME_SHELL_BUILDDIR', src_builddir) +shell_testenv.set('GNOME_SHELL_SESSION_MODE', 'user') +shell_testenv.set('SHELL_BACKGROUND_IMAGE', '@0@'.format(background_file)) +shell_testenv.append('GI_TYPELIB_PATH', gvc_typelib_path, separator: ':') +shell_testenv.append('LD_LIBRARY_PATH', libgvc_path, separator: ':') -foreach perf_test : perf_tests - test_name = perf_test['name'] - options = perf_test.get('options', []) +foreach shell_test : shell_tests + test_name = shell_test['name'] + options = shell_test.get('options', []) - test('perf-' + test_name, dbus_runner, + test('shell-' + test_name, dbus_runner, args: [ - perf_tool, + test_tool, '--headless', '--script=@0@/js/perf/@1@.js'.format(meson.project_source_root(), test_name), options, ], is_parallel: false, - env: perf_testenv, + env: shell_testenv, ) endforeach