From 24fa0f8e285520aee0aa76c7a08c078aaa6577a6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Jan 2020 00:58:13 -0500 Subject: [PATCH] testsuite: Move the meson performance tests up Since the binary is moved, there is no need for the subdirectory here anymore. --- testsuite/css/meson.build | 17 ++++++++++++++++- testsuite/css/performance/meson.build | 15 --------------- 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 testsuite/css/performance/meson.build diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build index d5c6ab513b..3a32c79691 100644 --- a/testsuite/css/meson.build +++ b/testsuite/css/meson.build @@ -2,7 +2,6 @@ subdir('parser') subdir('nodes') subdir('style') subdir('change') -subdir('performance') testexecdir = join_paths(installed_test_bindir, 'css') testdatadir = join_paths(installed_test_datadir, 'css') @@ -46,3 +45,19 @@ if get_option('install-tests') configuration: conf, install_dir: testdatadir) endif + +if get_option ('profiler') + + test('performance-adwaita', test_performance, + args: [ '--mark', 'style', join_paths(meson.current_build_dir(), '../../demos/widget-factory/gtk4-widget-factory') ], + env: [ 'GTK_THEME=Adwaita', + 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir) ], + suite: [ 'css' ]) + + test('performance-empty', test_performance, + args: [ '--mark', 'style', join_paths(meson.current_build_dir(), '../../demos/widget-factory/gtk4-widget-factory') ], + env: [ 'GTK_THEME=Empty', + 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir) ], + suite: [ 'css' ]) + +endif diff --git a/testsuite/css/performance/meson.build b/testsuite/css/performance/meson.build deleted file mode 100644 index 16a8dce1ef..0000000000 --- a/testsuite/css/performance/meson.build +++ /dev/null @@ -1,15 +0,0 @@ -if get_option ('profiler') - - test('performance-adwaita', test_performance, - args: [ '--mark', 'style', join_paths(meson.current_build_dir(), '../../../demos/widget-factory/gtk4-widget-factory') ], - env: [ 'GTK_THEME=Adwaita', - 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir) ], - suite: [ 'css' ]) - - test('performance-empty', test_performance, - args: [ '--mark', 'style', join_paths(meson.current_build_dir(), '../../../demos/widget-factory/gtk4-widget-factory') ], - env: [ 'GTK_THEME=Empty', - 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir) ], - suite: [ 'css' ]) - -endif