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

diff --git a/test/integration-tests/TEST-70-TPM2/meson.build b/test/integration-tests/TEST-70-TPM2/meson.build
index 88368646b4db289aefdfd4cf0cc7b37e9b43bb01..bf66f8f73e3cee1045641238860db239ae8e056c 100644 (file)
--- a/test/integration-tests/TEST-70-TPM2/meson.build
+++ b/test/integration-tests/TEST-70-TPM2/meson.build
@@ -9,5 +9,6 @@ integration_tests += [
                 },
                 'vm' : true,
                 'firmware' : 'auto',
+                'tpm' : true,
         },
 ]

diff --git a/test/integration-tests/TEST-86-MULTI-PROFILE-UKI/meson.build b/test/integration-tests/TEST-86-MULTI-PROFILE-UKI/meson.build
index 53042884cc75d90d83df08197d0088fb26b53ee9..51a70970906b9b248413251b8a4fe634da767796 100644 (file)
--- a/test/integration-tests/TEST-86-MULTI-PROFILE-UKI/meson.build
+++ b/test/integration-tests/TEST-86-MULTI-PROFILE-UKI/meson.build
@@ -6,5 +6,6 @@ integration_tests += [
                 'storage' : 'persistent',
                 'vm' : true,
                 'firmware' : 'auto',
+                'tpm' : true,
         },
 ]

diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py
index 9df00e843be203d0f7b2690167f685b66d477e1d..050e8c0f02500d646b28af7ace1f3ff85ac5341d 100755 (executable)
--- a/test/integration-tests/integration-test-wrapper.py
+++ b/test/integration-tests/integration-test-wrapper.py
@@ -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(
             [

diff --git a/test/integration-tests/meson.build b/test/integration-tests/meson.build
index f32a3f0c0cade92ec35fe1e5e06d61f3a89debb4..2dbc59ef1a96511e75dd5a09ad92d9c6a4f95e97 100644 (file)
--- a/test/integration-tests/meson.build
+++ b/test/integration-tests/meson.build
@@ -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