TEST-75-RESOLVED: Make sure --suppress-sync is not used

diff --git a/test/integration-tests/TEST-75-RESOLVED/meson.build b/test/integration-tests/TEST-75-RESOLVED/meson.build
index 8dec5f37e73a80d31833a772fa16883b02a07615..988aeb8dc98371dd21d3ec8eed99a0e167e2a224 100644 (file)
--- a/test/integration-tests/TEST-75-RESOLVED/meson.build
+++ b/test/integration-tests/TEST-75-RESOLVED/meson.build
@@ -3,5 +3,8 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                # knot uses lmdb which uses O_SYNC which will fail with EINVAL
+                # when running under --suppress-sync.
+                'suppress-sync' : false,
         },
 ]

diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py
index 0bbfb6044d434000aeae7d495789105da646b5bc..93e1e0d91b54f853bbbd330eb110d02a9bbeac39 100755 (executable)
--- a/test/integration-tests/integration-test-wrapper.py
+++ b/test/integration-tests/integration-test-wrapper.py
@@ -395,6 +395,7 @@ def main() -> None:
     parser.add_argument('--rtc', action=argparse.BooleanOptionalAction)
     parser.add_argument('--tpm', action=argparse.BooleanOptionalAction)
     parser.add_argument('--skip', action=argparse.BooleanOptionalAction)
+    parser.add_argument('--suppress-sync', action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument('mkosi_args', nargs='*')
     args = parser.parse_args()
 
@@ -612,7 +613,11 @@ def main() -> None:
         '--credential', f"journal.storage={'persistent' if sys.stdin.isatty() else args.storage}",
         *(['--runtime-build-sources=no', '--register=no'] if not sys.stdin.isatty() else []),
         'vm' if vm else 'boot',
-        *(['--', '--capability=CAP_BPF'] if not vm else []),
+        *(
+            ['--', '--capability=CAP_BPF', f'--suppress-sync={"yes" if args.suppress_sync else "no"}']
+            if not vm
+            else []
+        ),
     ]  # fmt: skip
 
     try:

diff --git a/test/integration-tests/meson.build b/test/integration-tests/meson.build
index 198371ccae49a692c33d14cb532a6bfc2944139d..7888283db81cb95638fe62027fb83ba0a72f96f8 100644 (file)
--- a/test/integration-tests/meson.build
+++ b/test/integration-tests/meson.build
@@ -31,6 +31,7 @@ integration_test_template = {
         'sanitizer-exclude-regex' : '',
         'rtc' : false,
         'tpm' : false,
+        'suppress-sync' : true,
 }
 
 foreach dirname : [
@@ -139,6 +140,10 @@ foreach integration_test : integration_tests
                 integration_test_args += ['--mkosi', mkosi.full_path()]
         endif
 
+        if integration_test['suppress-sync']
+                integration_test_args += ['--suppress-sync']
+        endif
+
         integration_test_args += ['--']
 
         if integration_test['cmdline'].length() > 0