| commit | 05d94afeba790d8789936a4bf79c1eb0cde1fa37 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 02 16:10:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 16:10:33 2021 +0000 |
| tree | 59f9f39813e6477ae6f79b7dc35a33b0742242fb | |
| parent | 1b5bf4a339c0633c3613b72969b65df33f692d01 [diff] | |
| parent | d7b3a20f253e78dbd3a434b08f0cdefe5acaa5a3 [diff] |
Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca am: d7b3a20f25 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902 Change-Id: I21fc54e73f35c7ca573f69ef842cc50521337337
diff --git a/security/secureclock/aidl/vts/functional/SecureClockAidlTest.cpp b/security/secureclock/aidl/vts/functional/SecureClockAidlTest.cpp index 9ca1ee8..31f4854 100644 --- a/security/secureclock/aidl/vts/functional/SecureClockAidlTest.cpp +++ b/security/secureclock/aidl/vts/functional/SecureClockAidlTest.cpp
@@ -185,9 +185,11 @@ INSTANTIATE_TEST_SUITE_P(PerInstance, SecureClockAidlTest, testing::ValuesIn(SecureClockAidlTest::build_params()), ::android::PrintInstanceNameToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SecureClockAidlTest); + } // namespace aidl::android::hardware::security::secureclock::test int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +}