summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot2018-06-02 08:06:44 -0500
committerAndroid (Google) Code Review2018-06-02 08:06:44 -0500
commit2ae3cb74c7224916fd47dcc1e7c146f1e3d316ee (patch)
tree7a6ae7055c326bbdc163cd99986ba95ec73676d7
parentc495cdbe2a5caf9de073f595b7a94ebb9b71e993 (diff)
parent68df40f9cf3b8be9c9453b9468f73dc6e049ad20 (diff)
downloadplatform-hardware-interfaces-2ae3cb74c7224916fd47dcc1e7c146f1e3d316ee.tar.gz
platform-hardware-interfaces-2ae3cb74c7224916fd47dcc1e7c146f1e3d316ee.tar.xz
platform-hardware-interfaces-2ae3cb74c7224916fd47dcc1e7c146f1e3d316ee.zip
Merge "VtsHalMediaOmx should test functionality only" into pi-dev
-rw-r--r--media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp5
-rw-r--r--media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp5
-rw-r--r--media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp5
-rw-r--r--media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp5
-rw-r--r--media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp5
5 files changed, 25 insertions, 0 deletions
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
index 42f99471..725e2904 100644
--- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
+++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
@@ -86,6 +86,11 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
86 this->omxNode = _nl; 86 this->omxNode = _nl;
87 }) 87 })
88 .isOk()); 88 .isOk());
89 if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) {
90 disableTest = true;
91 std::cout << "[ WARN ] Test Disabled, component not present\n";
92 return;
93 }
89 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); 94 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
90 ASSERT_NE(omxNode, nullptr); 95 ASSERT_NE(omxNode, nullptr);
91 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; 96 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role";
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp
index d5f1f2da..0ebab886 100644
--- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp
+++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp
@@ -86,6 +86,11 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
86 this->omxNode = _nl; 86 this->omxNode = _nl;
87 }) 87 })
88 .isOk()); 88 .isOk());
89 if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) {
90 disableTest = true;
91 std::cout << "[ WARN ] Test Disabled, component not present\n";
92 return;
93 }
89 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); 94 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
90 ASSERT_NE(omxNode, nullptr); 95 ASSERT_NE(omxNode, nullptr);
91 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; 96 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role";
diff --git a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp
index f7c84336..7750a12f 100644
--- a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp
+++ b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp
@@ -80,6 +80,11 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
80 this->omxNode = _nl; 80 this->omxNode = _nl;
81 }) 81 })
82 .isOk()); 82 .isOk());
83 if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) {
84 disableTest = true;
85 std::cout << "[ WARN ] Test Disabled, component not present\n";
86 return;
87 }
83 ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK); 88 ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);
84 ASSERT_NE(omxNode, nullptr); 89 ASSERT_NE(omxNode, nullptr);
85 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; 90 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role";
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
index 40e76c9a..1db9f753 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
@@ -87,6 +87,11 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
87 this->omxNode = _nl; 87 this->omxNode = _nl;
88 }) 88 })
89 .isOk()); 89 .isOk());
90 if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) {
91 disableTest = true;
92 std::cout << "[ WARN ] Test Disabled, component not present\n";
93 return;
94 }
90 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); 95 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
91 ASSERT_NE(omxNode, nullptr); 96 ASSERT_NE(omxNode, nullptr);
92 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; 97 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role";
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
index 2056d9e6..a740a809 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
@@ -100,6 +100,11 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
100 this->omxNode = _nl; 100 this->omxNode = _nl;
101 }) 101 })
102 .isOk()); 102 .isOk());
103 if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) {
104 disableTest = true;
105 std::cout << "[ WARN ] Test Disabled, component not present\n";
106 return;
107 }
103 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); 108 ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
104 ASSERT_NE(omxNode, nullptr); 109 ASSERT_NE(omxNode, nullptr);
105 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; 110 ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role";