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 /vr/1.0 | |
| 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 'vr/1.0')
| -rw-r--r-- | vr/1.0/vts/functional/Android.bp | 3 | ||||
| -rw-r--r-- | vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp index 36bc527be9..b2e50ad25e 100644 --- a/vr/1.0/vts/functional/Android.bp +++ b/vr/1.0/vts/functional/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "VtsHalVrV1_0TargetTest", - gtest: true, srcs: ["VtsHalVrV1_0TargetTest.cpp"], shared_libs: [ "liblog", @@ -24,7 +23,7 @@ cc_test { "libutils", "android.hardware.vr@1.0", ], - static_libs: ["libgtest"], + static_libs: ["VtsHalHidlTargetBaseTest"], cflags: [ "-O0", "-g", diff --git a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp index c7ec07627c..6a7b07803e 100644 --- a/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp +++ b/vr/1.0/vts/functional/VtsHalVrV1_0TargetTest.cpp @@ -18,7 +18,7 @@ #include <android-base/logging.h> #include <android/hardware/vr/1.0/IVr.h> #include <android/log.h> -#include <gtest/gtest.h> +#include <VtsHalHidlTargetBaseTest.h> #include <hardware/vr.h> using ::android::hardware::vr::V1_0::IVr; @@ -27,10 +27,10 @@ using ::android::hardware::Void; using ::android::sp; // The main test class for VR HIDL HAL. -class VrHidlTest : public ::testing::Test { +class VrHidlTest : public ::testing::VtsHalHidlTargetBaseTest { public: void SetUp() override { - vr = IVr::getService(); + vr = ::testing::VtsHalHidlTargetBaseTest::getService<IVr>(); ASSERT_NE(vr, nullptr); } |