meson: simplify test script

No need to set env, we have the test 'env' argument. Shorten the
PYTEST_FLAGS var name to keep the one-line script a little more
manageable.

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

Author: jk-ozlabs

meson.build

@@ -141,7 +141,9 @@ if tests
     # redirecting to a file. We can detect this if stdout is an terminal, and
     # disable TAP protocol.
     pytest = find_program('pytest')
-    script = '''export DBUS_STARTER_BUS_TYPE=user; if [ ! -t 1 ]; then PYTEST_FLAGS="--tap"; fi; @0@ $PYTEST_FLAGS $@'''.format(pytest.full_path())
+    script = 'if [ ! -t 1 ]; then PFL="--tap"; fi; @0@ $PFL $@'.format(
+      pytest.full_path()
+    )
     sh = find_program('sh')
     dbus_run_session = find_program('dbus-run-session')
 
@@ -159,6 +161,7 @@ if tests
         depends: [test_deps],
         args: [ sh.full_path(), '-c', script, '--' ],
         protocol: 'tap',
+        env: ['DBUS_STARTER_TYPE=user'],
     )
 
 endif