integration-tests: Don't enable tpm for every single test

This commit is contained in:
Daan De Meyer
2025-04-10 20:39:12 +02:00
committed by Yu Watanabe
parent beecd4e344
commit 9c8646646c
4 changed files with 9 additions and 0 deletions

View File

@@ -9,5 +9,6 @@ integration_tests += [
},
'vm' : true,
'firmware' : 'auto',
'tpm' : true,
},
]

View File

@@ -6,5 +6,6 @@ integration_tests += [
'storage' : 'persistent',
'vm' : true,
'firmware' : 'auto',
'tpm' : true,
},
]

View File

@@ -374,6 +374,7 @@ def main() -> None:
parser.add_argument('--coredump-exclude-regex', required=True)
parser.add_argument('--sanitizer-exclude-regex', required=True)
parser.add_argument('--rtc', action=argparse.BooleanOptionalAction)
parser.add_argument('--tpm', action=argparse.BooleanOptionalAction)
parser.add_argument('--skip', action=argparse.BooleanOptionalAction)
parser.add_argument('mkosi_args', nargs='*')
args = parser.parse_args()
@@ -566,6 +567,7 @@ def main() -> None:
*args.mkosi_args,
'--firmware', firmware,
*(['--kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
'--tpm', 'yes' if args.tpm else 'no',
'--kernel-command-line-extra',
' '.join(
[

View File

@@ -26,6 +26,7 @@ integration_test_template = {
'coredump-exclude-regex' : '',
'sanitizer-exclude-regex' : '',
'rtc' : false,
'tpm' : false,
}
foreach dirname : [
@@ -120,6 +121,10 @@ foreach integration_test : integration_tests
integration_test_args += ['--rtc']
endif
if integration_test['tpm']
integration_test_args += ['--tpm']
endif
if not integration_test['enabled']
integration_test_args += ['--skip']
endif