From fad7a62c39656de6cdf923ab37cfbb9dbe9be9ce Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 24 Jun 2022 12:59:40 +0100
Subject: [PATCH] test: Don't run integration tests at build-time

Some items listed in the tests array are helper executables rather
than actually being tests, and should not be run as a test at any time.
Those have {"test": false}. Expand this special case to the scripts
array for completeness (although currently, no scripts need this).

Meanwhile, some items listed in the scripts array are "as-installed"
integration tests which cannot safely be run at build-time, because
they make assertions about the state of the installed system.
Introduce {"build_time_test": false} for these, and expand this special
case to the tests array for completeness (although currently, no
compiled executables need this).

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 test/meson.build | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/test/meson.build b/test/meson.build
index b41f58365..787556420 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -514,7 +514,6 @@ foreach test: tests
     deps = test.get('deps', [])
     timeout = test.get('timeout', 30)
     install = test.get('install', true)
-    test_now = test.get('test', true)
 
     test_exe = executable('test-' + name,
         srcs,
@@ -525,8 +524,10 @@ foreach test: tests
         install_dir: test_exec_dir,
     )
 
-    # Some binaries are used in tests but are not themselves tests
-    if test_now
+    # Some binaries are used in tests but are not themselves tests,
+    # and some might be "as-installed" integration tests that aren't
+    # guaranteed to work at build-time
+    if test.get('build_time_test', true) and test.get('test', true)
         test(name,
             test_exe,
             args: ['--tap'],
@@ -547,8 +548,10 @@ if platform_unix and use_glib
     scripts += [
         {   'name': 'test-dbus-daemon-fork.sh', },
         {   'name': 'transient-services.sh',
-            'exec': 'integration/transient-services.sh', },
-        {   'name': 'test-apparmor-activation.sh' },
+            'exec': 'integration/transient-services.sh',
+            'build_time_test': false },
+        {   'name': 'test-apparmor-activation.sh',
+            'build_time_test': false },
     ]
 
     # Testing dbus-launch relies on special code in that binary.
@@ -571,11 +574,16 @@ foreach script: scripts
         )
     endif
 
-    test(name,
-        find_program(exec),
-        env: test_env,
-        depends: xdgdir,
-    )
+    # Some scripts might be used in tests but not themselves tests,
+    # and some are "as-installed" integration tests that aren't
+    # guaranteed to work at build-time
+    if script.get('build_time_test', true) and script.get('test', true)
+        test(name,
+            find_program(exec),
+            env: test_env,
+            depends: xdgdir,
+        )
+    endif
 endforeach
 
 
-- 
2.47.3