Reshuffle the a11y tests a bit

9 files changed, 29 insertions, 23 deletions

diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 04475922fe..105a06b331 100644
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/children --tap"
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/a11yderive.test.in b/testsuite/a11y/a11yderive.test.in
index b24dc3d274..7cb38e3ba2 100644
--- a/testsuite/a11y/a11yderive.test.in
+++ b/testsuite/a11y/a11yderive.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/derive"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/derive"
 Type=session
 
diff --git a/testsuite/a11y/a11ymisc.test.in b/testsuite/a11y/a11ymisc.test.in
index 0cbe27342b..ef48414ae8 100644
--- a/testsuite/a11y/a11ymisc.test.in
+++ b/testsuite/a11y/a11ymisc.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/misc --tap"
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/a11ytests.test.in b/testsuite/a11y/a11ytests.test.in
index b158f5117b..b67df9df70 100644
--- a/testsuite/a11y/a11ytests.test.in
+++ b/testsuite/a11y/a11ytests.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_CSD=1 @libexecdir@/installed-tests/gtk+/accessibility-dump -k --verbose --directory @libexecdir@/installed-tests/gtk+/a11ytests"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_CSD=1 @libexecdir@/installed-tests/gtk-4.0/a11y/accessibility-dump -k --verbose --directory @libexecdir@/installed-tests/gtk-4.0/a11y"
 Type=session
 
diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index 9a9c597fd9..dacc009981 100644
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/text --tap"
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index 081438d4de..ac62adb7e1 100644
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/tree-relationships --tap"
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index fa6cc0bc91..819f479cb9 100644
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,5 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/util --tap"
+:q
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index 70334ac48d..db4fb9b786 100644
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value --tap"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/value --tap"
 Type=session
 Output=TAP
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index b5e0814eeb..6a3a17e588 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -10,12 +10,15 @@ a11y_tests = [
   'util',
 ]
 
+testexecdir = join_paths(installed_test_bindir, 'a11y')
+
 foreach t: a11y_tests
   test_prefix = 'a11y'
 
-  test ('@0@/@1@'.format(test_prefix, t),
-        executable ('@0@_@1@'.format(test_prefix, t.underscorify()),
-                    '@0@.c'.format(t),
+  test (t,
+        executable (t, '@0@.c'.format(t),
+                    install: get_option('install-tests'),
+                    install_dir: testexecdir,
                     dependencies: libgtk_dep),
         args: [ '--tap', '-k', ],
         env: installed_test_env)
@@ -32,17 +35,6 @@ a11y_installed_tests = [
   'a11ymisc.test',
 ]
 
-test_cdata = configuration_data()
-test_cdata.set('libexecdir', get_option('libexecdir'))
-
-foreach t: a11y_installed_tests
-  configure_file(input: '@0@.in'.format(t),
-                 output: t,
-                 configuration: test_cdata,
-                 install: true,
-                 install_dir: installed_test_datadir)
-endforeach
-
 installed_test_data = [
   'hello-world.ui',
   'hello-world.txt',
@@ -120,4 +112,17 @@ installed_test_data = [
   'tooltips.txt',
 ]
 
-install_data(installed_test_data, install_dir: join_paths(installed_test_bindir, 'a11ytests'))
+if get_option('install-tests')
+  test_cdata = configuration_data()
+  test_cdata.set('libexecdir', gtk_libexecdir)
+
+  foreach t: a11y_installed_tests
+    configure_file(input: '@0@.in'.format(t),
+                   output: t,
+                   configuration: test_cdata,
+                   install: true,
+                   install_dir: installed_test_datadir)
+  endforeach
+
+  install_data(installed_test_data, install_dir: testexecdir)
+endif