diff --git a/gtk/meson.build b/gtk/meson.build index 2adbe2c6ea..6bdf79912c 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -857,11 +857,13 @@ foreach tool : gtk_tools tool_name = tool.get(0) tool_srcs = tool.get(1) - executable(tool_name, tool_srcs, + exe = executable(tool_name, tool_srcs, include_directories: [confinc], c_args: gtk_cargs, dependencies: libgtk_dep, install: true) + + set_variable(tool_name.underscorify(), exe) # used in testsuites endforeach # Data to install diff --git a/testsuite/meson.build b/testsuite/meson.build index 59a07774e9..fef8506bbd 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -2,5 +2,5 @@ subdir('gtk') subdir('gdk') subdir('css') subdir('a11y') -# subdir('tools') # FIXME +subdir('tools') # subdir('reftests') # FIXME: needs more work diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build new file mode 100644 index 0000000000..d705601c62 --- /dev/null +++ b/testsuite/tools/meson.build @@ -0,0 +1,31 @@ +bash = find_program('bash', required : false) +if bash.found() + test_env = environment() + test_env.set('GTK_BUILDER_TOOL', get_variable('gtk4_builder_tool').full_path()) + test_env.set('GTK_QUERY_SETTINGS', get_variable('gtk4_query_settings').full_path()) + + foreach t : ['simplify', 'settings'] + configure_file(output : 'test-@0@'.format(t), + input : 'test-@0@.in'.format(t), + configuration : configuration_data()) + + test('test-@0@'.format(t), bash, + args : 'test-@0@'.format(t), + workdir : meson.current_build_dir(), + env : test_env) + endforeach +endif # bash found + +# Installed data + +test_simplify_data = [ + 'simplify/test1.ui', 'simplify/test1.expected', + 'simplify/test2.ui', 'simplify/test2.expected', + 'simplify/test3.ui', 'simplify/test3.expected', + 'simplify/test4.ui', 'simplify/test4.expected', + 'simplify/test5.ui', 'simplify/test5.expected', + 'simplify/test6.ui', 'simplify/test6.expected', + 'simplify/test7.ui', 'simplify/test7.expected', + 'simplify/test8.ui', 'simplify/test8.expected', +] +# TODO: install in case of installed tests - install_data()