Merge pull request #33105 from DaanDeMeyer/sanitizers

Sanitizers

test/TEST-21-DFUZZER/meson.build

@@ -5,7 +5,6 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
                 'timeout' : 3600,
                 'priority' : 50,
-                'slow' : true,
                 'vm' : true,
         },
 ]

test/TEST-69-SHUTDOWN/meson.build

@@ -4,5 +4,9 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'unit' : files('TEST-69-SHUTDOWN.service'),
+                'configuration' : integration_test_template['configuration'] + {
+                        'wants' : '@0@ systemd-user-sessions.service'.format(integration_test_template['configuration']['wants']),
+                        'after' : '@0@ systemd-user-sessions.service'.format(integration_test_template['configuration']['after']),
+                },
         },
 ]

test/meson.build

@@ -281,7 +281,6 @@ integration_test_template = {
         'storage' : 'volatile',
         'priority' : 0,
         'firmware' : 'linux',
-        'slow' : false,
         'enabled' : true,
         'configuration' : {
                 'memory-accounting' : 'no',
@@ -404,10 +403,6 @@ foreach integration_test : integration_tests
                 install_data(integration_test_unit, install_dir : testdata_dir / 'units')
         endif
 
-        if integration_test['slow']
-                integration_test_args += ['--slow']
-        endif
-
         if integration_test['vm']
                 integration_test_args += ['--vm']
         endif
@@ -440,10 +435,6 @@ foreach integration_test : integration_tests
                 integration_test_env += {'SYSTEMD_INTEGRATION_TESTS': '1'}
         endif
 
-        if want_slow_tests
-                integration_test_env += {'SYSTEMD_SLOW_TESTS': '1'}
-        endif
-
         if not integration_test['enabled']
                 continue
         endif