summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Moore <devinmoore@google.com>2023-11-22 18:27:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-22 18:27:38 +0000
commit5e2c83da4f313288ea44a7d07fb7735a08613967 (patch)
treebe5566eb7ccc5cc7821e7ee2332f36faa3546379
parenta739816bc553bed6536535973a0d47bdd6e45349 (diff)
parent79dd1fff93f62580f9215fd1a6f13e09ab41836b (diff)
downloadlibhidl-5e2c83da4f313288ea44a7d07fb7735a08613967.tar.gz
libhidl_test: stop expecting HIDL HALs am: 79dd1fff93
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2843913 Change-Id: I6618890649e3faf4e4a5c5b8c94e719885acd331 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--transport/allocator/1.0/vts/functional/VtsHidlAllocatorV1_0TargetTest.cpp1
-rw-r--r--transport/base/1.0/vts/functional/vts_ibase_test.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/transport/allocator/1.0/vts/functional/VtsHidlAllocatorV1_0TargetTest.cpp b/transport/allocator/1.0/vts/functional/VtsHidlAllocatorV1_0TargetTest.cpp
index 340ec0c..b824a3e 100644
--- a/transport/allocator/1.0/vts/functional/VtsHidlAllocatorV1_0TargetTest.cpp
+++ b/transport/allocator/1.0/vts/functional/VtsHidlAllocatorV1_0TargetTest.cpp
@@ -122,6 +122,7 @@ TEST_P(AllocatorHidlTest, TestCommit) {
}
}
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AllocatorHidlTest);
INSTANTIATE_TEST_SUITE_P(
PerInstance, AllocatorHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(IAllocator::descriptor)),
diff --git a/transport/base/1.0/vts/functional/vts_ibase_test.cpp b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
index 96125d0..f8f8b33 100644
--- a/transport/base/1.0/vts/functional/vts_ibase_test.cpp
+++ b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
@@ -155,7 +155,9 @@ class VtsHalBaseV1_0TargetTest : public ::testing::Test {
}
}));
- ASSERT_FALSE(all_hals_.empty()); // sanity
+ if (all_hals_.empty()) {
+ GTEST_SKIP() << "No HIDL HAls on this device.";
+ }
}
void EachHal(const std::function<void(const Hal&)>& check) {