tests: split meson test() definitions into individual test scripts

We currently have one pytest invocation (through one meson test()) which
runs all of the tests/test_*.py scripts.

However, not all of those will be testable in any particular
configuration. We may be building without libsystemd, in which case the
test_mctpd.py and test_mctpd_endpoint.py tests will not work.

So, define individual test() calls for each of the scripts. This also
lets us modify the runtime environment (the mctp-only tests don't
require dbus-run-session), and meson can parallelise too.

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

meson.build

@@ -63,8 +63,6 @@ mctp_test = executable('test-mctp',
     include_directories:  include_directories('src'),
 )
 
-test_deps = [mctp_test]
-
 executable('mctp-req',
     sources: ['src/mctp-req.c'] + util_sources,
 )
@@ -99,7 +97,6 @@ if libsystemd.found()
         include_directories:  include_directories('src'),
         dependencies: [libsystemd, toml_dep],
     )
-    test_deps += mctpd_test
 endif
 
 tests = get_option('tests')
@@ -140,26 +137,36 @@ if tests
     # to allow pytest to print output directly onto the terminal without
     # redirecting to a file. We can detect this if stdout is an terminal, and
     # disable TAP protocol.
+    test_dir = join_paths(meson.current_source_dir(), 'tests')
+    pytest_conf = join_paths(test_dir, 'pytest.ini')
+
     pytest = find_program('pytest')
-    script = 'if [ ! -t 1 ]; then PFL="--tap"; fi; DBUS_STARTER_BUS_TYPE=user "@0@" $PFL $@'.format(
-      pytest.full_path()
+    script = 'if [ ! -t 1 ]; then PFL="--tap"; fi; DBUS_STARTER_BUS_TYPE=user "@0@" $PFL --config-file "@1@" $@'.format(
+      pytest.full_path(),
+      pytest_conf,
     )
     sh = find_program('sh')
-    dbus_run_session = find_program('dbus-run-session')
-
-    test_conf_data = configuration_data()
-    test_conf_data.set('testpaths',
-      join_paths(meson.current_source_dir(), 'tests')
-    )
-    configure_file(
-        input: 'tests/pytest.ini.in',
-        output: 'pytest.ini',
-        configuration: test_conf_data,
-    )
-
-    test('test-mctpd', dbus_run_session,
-        depends: [test_deps],
-        args: [ sh.full_path(), '-c', script, '--' ],
+    test_args = [ '-c', script, '--' ]
+
+    if libsystemd.found()
+        dbus_run_session = find_program('dbus-run-session')
+
+        test('test-mctpd', dbus_run_session,
+            depends: [mctpd_test],
+            args: [sh.full_path()] + test_args + [test_dir / 'test_mctpd.py'],
+            protocol: 'tap',
+        )
+
+        test('test-mctpd-endpoint', dbus_run_session,
+            depends: [mctpd_test],
+            args: [sh.full_path()] + test_args + [test_dir / 'test_mctpd_endpoint.py'],
+            protocol: 'tap',
+        )
+    endif
+
+    test('test-mctp', sh,
+        depends: [mctp_test],
+        args: test_args + [test_dir / 'test_mctp.py'],
         protocol: 'tap',
     )
 

tests/pytest.ini.in renamed to tests/pytest.ini

@@ -1,6 +1,5 @@
 [pytest]
 trio_mode = true
-testpaths = @testpaths@
 filterwarnings =
     ignore:.*wait_readable:DeprecationWarning:asyncdbus
     ignore:.*wait_writable:DeprecationWarning:asyncdbus