summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuexi Ma2017-02-28 03:46:51 -0600
committerYuexi Ma2017-02-28 16:27:28 -0600
commit50d7e27b3c13885d2bd90dc0f0f2366cd0523f77 (patch)
treeee9fc44d39d7fa78dabeac43118ccebdd251fb91 /boot/1.0/vts
parent48c9837a556225804964bf8f754772056d207790 (diff)
downloadplatform-hardware-interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.gz
platform-hardware-interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.xz
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.bp3
-rw-r--r--boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp6
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 50811628..7643e1d6 100644
--- a/boot/1.0/vts/functional/Android.bp
+++ b/boot/1.0/vts/functional/Android.bp
@@ -16,7 +16,6 @@
16 16
17cc_test { 17cc_test {
18 name: "VtsHalBootV1_0TargetTest", 18 name: "VtsHalBootV1_0TargetTest",
19 gtest: true,
20 srcs: ["VtsHalBootV1_0TargetTest.cpp"], 19 srcs: ["VtsHalBootV1_0TargetTest.cpp"],
21 shared_libs: [ 20 shared_libs: [
22 "libbase", 21 "libbase",
@@ -27,7 +26,7 @@ cc_test {
27 "libutils", 26 "libutils",
28 "android.hardware.boot@1.0", 27 "android.hardware.boot@1.0",
29 ], 28 ],
30 static_libs: ["libgtest"], 29 static_libs: ["VtsHalHidlTargetBaseTest"],
31 cflags: [ 30 cflags: [
32 "-O0", 31 "-O0",
33 "-g", 32 "-g",
diff --git a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
index 36142dff..49eefb12 100644
--- a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
+++ b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
@@ -21,7 +21,7 @@
21 21
22#include <android/hardware/boot/1.0/IBootControl.h> 22#include <android/hardware/boot/1.0/IBootControl.h>
23 23
24#include <gtest/gtest.h> 24#include <VtsHalHidlTargetBaseTest.h>
25 25
26using ::android::hardware::boot::V1_0::IBootControl; 26using ::android::hardware::boot::V1_0::IBootControl;
27using ::android::hardware::boot::V1_0::CommandResult; 27using ::android::hardware::boot::V1_0::CommandResult;
@@ -32,10 +32,10 @@ using ::android::hardware::Return;
32using ::android::sp; 32using ::android::sp;
33 33
34// The main test class for the Boot HIDL HAL. 34// The main test class for the Boot HIDL HAL.
35class BootHidlTest : public ::testing::Test { 35class BootHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
36 public: 36 public:
37 virtual void SetUp() override { 37 virtual void SetUp() override {
38 boot = IBootControl::getService(); 38 boot = ::testing::VtsHalHidlTargetBaseTest::getService<IBootControl>();
39 ASSERT_NE(boot, nullptr); 39 ASSERT_NE(boot, nullptr);
40 } 40 }
41 41