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 /memtrack/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 'memtrack/1.0')
-rw-r--r-- | memtrack/1.0/vts/functional/Android.bp | 3 | ||||
-rw-r--r-- | memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp index b9d89be6c9..27781af8b0 100644 --- a/memtrack/1.0/vts/functional/Android.bp +++ b/memtrack/1.0/vts/functional/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "VtsHalMemtrackV1_0TargetTest", - gtest: true, srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], shared_libs: [ "libbase", @@ -27,7 +26,7 @@ cc_test { "libutils", "android.hardware.memtrack@1.0", ], - static_libs: ["libgtest"], + static_libs: ["VtsHalHidlTargetBaseTest"], cflags: [ "-O0", "-g", diff --git a/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp b/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp index a4b4fa9980..1113f425a8 100644 --- a/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp +++ b/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp @@ -18,7 +18,7 @@ #include <android-base/logging.h> #include <android/hardware/memtrack/1.0/IMemtrack.h> -#include <gtest/gtest.h> +#include <VtsHalHidlTargetBaseTest.h> #include <algorithm> #include <vector> @@ -34,10 +34,10 @@ using ::android::sp; using std::vector; using std::count_if; -class MemtrackHidlTest : public ::testing::Test { +class MemtrackHidlTest : public ::testing::VtsHalHidlTargetBaseTest { public: virtual void SetUp() override { - memtrack = IMemtrack::getService(); + memtrack = ::testing::VtsHalHidlTargetBaseTest::getService<IMemtrack>(); ASSERT_NE(memtrack, nullptr); } |