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

(cherry picked from commit 0d57260976)
This commit is contained in:
Daan De Meyer
2026-04-06 15:11:08 +02:00
committed by Luca Boccassi
parent 4f974b5492
commit bcf9560093
3 changed files with 14 additions and 1 deletions

View File

@@ -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,
},
]

View File

@@ -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:

View File

@@ -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