testsuite: Move the meson performance tests up
authorMatthias Clasen <mclasen@redhat.com>
Wed, 22 Jan 2020 05:58:13 +0000 (00:58 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 22 Jan 2020 05:59:09 +0000 (00:59 -0500)
Since the binary is moved, there is no need for
the subdirectory here anymore.

testsuite/css/meson.build
testsuite/css/performance/meson.build [deleted file]

index d5c6ab513bbbb1f142ebc26d51f47bc41af1eb0b..3a32c7969118221a1f2d72497863bd4a4591632c 100644 (file)
@@ -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 (file)
index 16a8dce..0000000
+++ /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