| commit | 49e1475819e2d292e9cee4bdda72fd79a66d3083 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 02 17:34:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 17:34:04 2021 +0000 |
| tree | c892fde8ac351dd588d3a186406638da3f4d9be0 | |
| parent | dd9cf030534a21a9b3244788b9dcbee04abbbdbb [diff] | |
| parent | 632422424b5c3503c6d8b2b4cc7970df9dee2301 [diff] |
Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca am: d7b3a20f25 am: 05d94afeba am: 632422424b Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902 Change-Id: Ia272a9be1d46985eca759a0a027d1624c2bd6706
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 +}