Merge "Delete standard output in VtsAidlKeyMintTargetTest" into android14-tests-dev am: 9d0352bf56 am: 5ae97637b1 am: 03d33a7534

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3083274

Change-Id: If05d55abbbe61f8eb46358f1dff0063aa93ef7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale 2024-06-07 07:46:57 +00:00 committed by Automerger Merge Worker
commit 4972de4e7d

View file

@ -8683,14 +8683,6 @@ INSTANTIATE_KEYMINT_AIDL_TEST(VsrRequirementTest);
} // namespace aidl::android::hardware::security::keymint::test } // namespace aidl::android::hardware::security::keymint::test
int main(int argc, char** argv) { int main(int argc, char** argv) {
std::cout << "Testing ";
auto halInstances =
aidl::android::hardware::security::keymint::test::KeyMintAidlTestBase::build_params();
std::cout << "HAL instances:\n";
for (auto& entry : halInstances) {
std::cout << " " << entry << '\n';
}
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {