diff options
| author | Yuexi Ma <yuexima@google.com> | 2017-02-28 01:46:51 -0800 |
|---|---|---|
| committer | Yuexi Ma <yuexima@google.com> | 2017-02-28 22:27:28 +0000 |
| commit | 50d7e27b3c13885d2bd90dc0f0f2366cd0523f77 (patch) | |
| tree | ee9fc44d39d7fa78dabeac43118ccebdd251fb91 /boot/1.0/vts | |
| parent | 48c9837a556225804964bf8f754772056d207790 (diff) | |
| download | platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.gz platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.bz2 platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.zip | |
change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master)
Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
Diffstat (limited to 'boot/1.0/vts')
| -rw-r--r-- | boot/1.0/vts/functional/Android.bp | 3 | ||||
| -rw-r--r-- | boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp index 5081162836..7643e1d6e9 100644 --- a/boot/1.0/vts/functional/Android.bp +++ b/boot/1.0/vts/functional/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "VtsHalBootV1_0TargetTest", - gtest: true, srcs: ["VtsHalBootV1_0TargetTest.cpp"], shared_libs: [ "libbase", @@ -27,7 +26,7 @@ cc_test { "libutils", "android.hardware.boot@1.0", ], - static_libs: ["libgtest"], + static_libs: ["VtsHalHidlTargetBaseTest"], cflags: [ "-O0", "-g", diff --git a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp index 36142dff64..49eefb122a 100644 --- a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp +++ b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp @@ -21,7 +21,7 @@ #include <android/hardware/boot/1.0/IBootControl.h> -#include <gtest/gtest.h> +#include <VtsHalHidlTargetBaseTest.h> using ::android::hardware::boot::V1_0::IBootControl; using ::android::hardware::boot::V1_0::CommandResult; @@ -32,10 +32,10 @@ using ::android::hardware::Return; using ::android::sp; // The main test class for the Boot HIDL HAL. -class BootHidlTest : public ::testing::Test { +class BootHidlTest : public ::testing::VtsHalHidlTargetBaseTest { public: virtual void SetUp() override { - boot = IBootControl::getService(); + boot = ::testing::VtsHalHidlTargetBaseTest::getService<IBootControl>(); ASSERT_NE(boot, nullptr); } |