integration-tests: adjust priorities

When running with sanitizers:
```
26/95 systemd:integration-tests / TEST-21-DFUZZER                          OK 1517.75s
40/95 systemd:integration-tests / TEST-85-NETWORK-NetworkdDHCPClientTests  OK  779.18s
42/95 systemd:integration-tests / TEST-04-JOURNAL                          OK  716.17s
```
and without sanitizers:
```
44/95 systemd:integration-tests / TEST-85-NETWORK-NetworkdDHCPClientTests  OK  730.33s
29/95 systemd:integration-tests / TEST-64-UDEV-STORAGE-simultaneous_events OK  701.49s
40/95 systemd:integration-tests / TEST-04-JOURNAL                          OK  348.05s
```

So, let's set higher priorities only on these tests.

diff --git a/test/integration-tests/TEST-04-JOURNAL/meson.build b/test/integration-tests/TEST-04-JOURNAL/meson.build
index 184f70ab720bbfab14df975559b48a53f762949f..d61cbcb0018779b0609a8d23b5bc5c2238836dc8 100644 (file)
--- a/test/integration-tests/TEST-04-JOURNAL/meson.build
+++ b/test/integration-tests/TEST-04-JOURNAL/meson.build
@@ -6,5 +6,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'storage' : 'persistent',
+                'priority' : 10,
         },
 ]

diff --git a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
index cbd6b6977721053f16ca587a79137951a96cee19..76b0ebeb87d010611b59e983f3bae5d7c5ec318d 100644 (file)
--- a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
+++ b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
@@ -146,6 +146,7 @@ udev_storage_tests += udev_storage_test_template + {
         'name' : 'simultaneous_events',
         'cmdline' : cmdline,
         'qemu-args' : qemu_args,
+        'priority' : 10,
 }
 
 cmdline = []
@@ -256,7 +257,7 @@ foreach testcase : udev_storage_tests
                                 },
                         },
                         'mkosi-args' : integration_test_template['mkosi-args'] + cmdline,
-                        'priority' : 10,
+                        'priority' : testcase.get('priority', 0),
                         'vm' : true,
                         # Suppress ASan error
                         # 'multipathd[1820]: ==1820==ERROR: AddressSanitizer: Joining already joined thread, aborting.'

diff --git a/test/integration-tests/TEST-73-LOCALE/meson.build b/test/integration-tests/TEST-73-LOCALE/meson.build
index e5b9f19015167f73e757ca20c7c4aafec7b4facb..f3e645b872da7fe4952d3a68773f6fbe789f679a 100644 (file)
--- a/test/integration-tests/TEST-73-LOCALE/meson.build
+++ b/test/integration-tests/TEST-73-LOCALE/meson.build
@@ -3,7 +3,6 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
-                'priority' : 10,
                 # TODO: Remove when https://github.com/systemd/systemd/issues/35335 is fixed.
                 'coredump-exclude-regex' : '/systemd-localed',
         },

diff --git a/test/integration-tests/TEST-85-NETWORK/meson.build b/test/integration-tests/TEST-85-NETWORK/meson.build
index 7bce51abbe7b0e3d49183ffe813a419ac6f4f4ad..cf3ea53469455ae46a1163473a3f99cb8c74cdc9 100644 (file)
--- a/test/integration-tests/TEST-85-NETWORK/meson.build
+++ b/test/integration-tests/TEST-85-NETWORK/meson.build
@@ -32,7 +32,7 @@ foreach testcase : [
                                         'TEST_MATCH_TESTCASE': testcase,
                                 }
                         },
-                        'priority' : 10,
+                        'priority' : testcase == 'NetworkdDHCPClientTests' ? 10 : 0,
                         'vm' : true,
                 },
         ]