Merge tag 'v1.94.0' into tod

Tag 1.94.0

Git-EVTag-v0-SHA512: 7cf9d7defb02433140f575589099569a5848ab34e8ecb0a4a90bb3c9eb1c228a16438afe1b23c381b59c1506f189a845752fead3dbd3c1c11f686cf47302cb1b

tests/meson.build

@@ -24,13 +24,17 @@ envs.set('NO_AT_BRIDGE', '1')
 drivers_tests = [
     'aes3500',
     'elan',
+    'elanmoc',
+    'elanspi',
     'synaptics',
+    'upektc_img',
     'vfs0050',
     'vfs301',
     'vfs5011',
     'vfs7552',
     'goodixmoc',
     'nb1010',
+    'egis0570',
 ]
 
 if get_option('introspection')
@@ -82,17 +86,22 @@ if get_option('introspection')
     endforeach
 
     foreach driver_test: drivers_tests
+        if driver_test.contains('-')
+          driver_name = driver_test.split('-')[0]
+        else
+          driver_name = driver_test
+        endif
         driver_envs = envs
-        driver_envs.set('FP_DRIVERS_WHITELIST', driver_test)
+        driver_envs.set('FP_DRIVERS_WHITELIST', driver_name)
 
-        if (driver_test in supported_drivers and
+        if (driver_name in supported_drivers and
             gusb_dep.version().version_compare('>= 0.3.0'))
             test(driver_test,
                 find_program('umockdev-test.py'),
                 args: join_paths(meson.current_source_dir(), driver_test),
                 env: driver_envs,
                 suite: ['drivers'],
-                timeout: 10,
+                timeout: 15,
                 depends: libfprint_typelib,
             )
         else
@@ -177,9 +186,8 @@ foreach test_name: unit_tests
         link_with: test_utils,
     )
     test(test_name,
-        find_program('test-runner.sh'),
+        test_exe,
         suite: ['unit-tests'],
-        args: [test_exe],
         env: envs,
     )
 endforeach
@@ -193,11 +201,17 @@ test('udev-hwdb',
 
 gdb = find_program('gdb', required: false)
 if gdb.found()
+    libfprint_wrapper = [
+        gdb.path(),
+        '-batch',
+        '-ex', 'run',
+        '--args',
+    ]
     add_test_setup('gdb',
         timeout_multiplier: 1000,
+        exe_wrapper: libfprint_wrapper,
         env: [
-            'LIBFPRINT_TEST_WRAPPER=@0@ --args'.format(
-                gdb.path())
+            'LIBFPRINT_TEST_WRAPPER=' + ' '.join(libfprint_wrapper),
         ])
 endif
 
@@ -207,14 +221,20 @@ if valgrind.found()
     glib_suppressions = glib_share + '/valgrind/glib.supp'
     python_suppressions = '@0@/@1@'.format(meson.source_root(),
         files('valgrind-python.supp')[0])
+    libfprint_wrapper = [
+        valgrind.path(),
+        '--tool=memcheck',
+        '--leak-check=full',
+        '--suppressions=' + glib_suppressions,
+        '--suppressions=' + python_suppressions,
+    ]
     add_test_setup('valgrind',
         timeout_multiplier: 10,
+        exe_wrapper: libfprint_wrapper,
         env: [
             'G_SLICE=always-malloc',
             'UNDER_VALGRIND=1',
-            ('LIBFPRINT_TEST_WRAPPER=@0@ --tool=memcheck --leak-check=full ' +
-             '--suppressions=@1@ --suppressions=@2@').format(
-                valgrind.path(), glib_suppressions, python_suppressions)
+            'LIBFPRINT_TEST_WRAPPER=' + ' '.join(libfprint_wrapper),
         ])
 endif
 
@@ -305,9 +325,8 @@ if get_option('tod')
             tod_test_envs.set('FP_TOD_TEST_DRIVER_NAME', tod_driver)
 
             test(test_name + '-' + tod_driver,
-                find_program('test-runner.sh'),
+                test_exe,
                 suite: ['unit-tests', 'tod', tod_driver],
-                args: [test_exe],
                 env: tod_test_envs,
                 depends: fake_driver,
             )