commit 9f5c0c57344cee58b026aabf78687dd1b2a470f9
author David Drysdale <drysdale@google.com> Thu Nov 03 15:10:16 2022 +0000
committer David Drysdale <drysdale@google.com> Mon Dec 19 15:52:52 2022 +0000
tree 5c68d38648c6ad30f02b69d512dca5891c6d350e
parent cb0fc410d7c71e87bdf3cfb58edf34170f8686d2

KeyMint manual key upgrade tests

Test: VtsAidlKeyMintTargetTest
Change-Id: I95d74cec80e94da316dab02b7a88b855742c877c

security/keymint/aidl/vts/functional/KeyMintTest.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 5a86283..c54dde4 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -8641,6 +8641,15 @@
                 // interactions.
                 aidl::android::hardware::security::keymint::test::check_boot_pl = false;
             }
+            if (std::string(argv[i]) == "--keyblob_dir") {
+                if (i + 1 >= argc) {
+                    std::cerr << "Missing argument for --keyblob_dir\n";
+                    return 1;
+                }
+                aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::keyblob_dir =
+                        std::string(argv[i + 1]);
+                ++i;
+            }
         }
     }
     return RUN_ALL_TESTS();