diff options
author | Zhuoyao Zhang <zhuoyao@google.com> | 2018-01-23 18:16:27 -0800 |
---|---|---|
committer | Zhuoyao Zhang <zhuoyao@google.com> | 2018-01-23 18:20:56 -0800 |
commit | f62c91f057bb6d8962f6cfc686e382cb8cada4ad (patch) | |
tree | 5affd86ce9297d58b2e6efe538c2f2aaf3c07812 /audio/common | |
parent | 744e71e3e862507d9806ee9f9a9ef0684cc9d4b5 (diff) | |
download | android_hardware_interfaces-f62c91f057bb6d8962f6cfc686e382cb8cada4ad.tar.gz android_hardware_interfaces-f62c91f057bb6d8962f6cfc686e382cb8cada4ad.tar.bz2 android_hardware_interfaces-f62c91f057bb6d8962f6cfc686e382cb8cada4ad.zip |
Convert audio hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalAudioV2_0Target
Change-Id: I1f85216c992eabf70f7e907b5d2afc4fb59cbb4a
Diffstat (limited to 'audio/common')
-rw-r--r-- | audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h b/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h index 81d92c247..a96d06e04 100644 --- a/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h +++ b/audio/common/all-versions/test/utility/include/utility/EnvironmentTearDown.h @@ -20,6 +20,7 @@ #include <functional> #include <list> +#include <VtsHalHidlTargetTestEnvBase.h> #include <gtest/gtest.h> namespace android { @@ -33,13 +34,13 @@ namespace utility { * Avoid destroying static objects after main return. * Post main return destruction leads to incorrect gtest timing measurements as * well as harder debuging if anything goes wrong during destruction. */ -class Environment : public ::testing::Environment { +class Environment : public ::testing::VtsHalHidlTargetTestEnvBase { public: using TearDownFunc = std::function<void()>; void registerTearDown(TearDownFunc&& tearDown) { tearDowns.push_back(std::move(tearDown)); } private: - void TearDown() override { + void HidlTearDown() override { // Call the tear downs in reverse order of insertion for (auto& tearDown : tearDowns) { tearDown(); |