summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-23 00:23:21 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-23 00:23:21 +0000
commitf55a8b2304e2e90983ca86999424e48ec02a5a8d (patch)
treebe5566eb7ccc5cc7821e7ee2332f36faa3546379
parent99c5d62e8ee735c101fb62cc67184529c63763af (diff)
parent84e59531c03c16e9327895b03aedcffed07a09c7 (diff)
downloadlibhidl-f55a8b2304e2e90983ca86999424e48ec02a5a8d.tar.gz
Snap for 11135477 from 84e59531c03c16e9327895b03aedcffed07a09c7 to 24Q1-release
Change-Id: Ib06199f2e903aa7dd35c62ad56b3700c1335c38b
-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) {