diff options
| author | Ray Essick <essick@google.com> | 2018-06-04 11:27:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-04 11:27:51 -0700 |
| commit | 25ae1956d1cc399fb42a9f9fea95c702acc9945d (patch) | |
| tree | 19d17e3a4bf747e9044dfd47a1ec9c0744a2d082 /media | |
| parent | b5340a440c978113d9c30ef3745782bdeba5ab6d (diff) | |
| parent | 27aa09d3bb770af4f6cc80cfe491714c7bdc7e04 (diff) | |
| download | platform_hardware_interfaces-25ae1956d1cc399fb42a9f9fea95c702acc9945d.tar.gz platform_hardware_interfaces-25ae1956d1cc399fb42a9f9fea95c702acc9945d.tar.bz2 platform_hardware_interfaces-25ae1956d1cc399fb42a9f9fea95c702acc9945d.zip | |
Merge "VtsHalMediaOmx should test functionality only" into pi-dev am: 2ae3cb74c7
am: 27aa09d3bb
Change-Id: I9cda9833322ea326cedcf07577b2104e4106e94c
Diffstat (limited to 'media')
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 42f99471d2..725e2904ea 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 { this->omxNode = _nl; }) .isOk()); + if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { + disableTest = true; + std::cout << "[ WARN ] Test Disabled, component not present\n"; + return; + } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); 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 d5f1f2da37..0ebab886e4 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 { this->omxNode = _nl; }) .isOk()); + if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { + disableTest = true; + std::cout << "[ WARN ] Test Disabled, component not present\n"; + return; + } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); 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 c37f7aef40..4ddc833ef7 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 { this->omxNode = _nl; }) .isOk()); + if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { + disableTest = true; + std::cout << "[ WARN ] Test Disabled, component not present\n"; + return; + } ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); 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 40e76c9a3b..1db9f7531a 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 { this->omxNode = _nl; }) .isOk()); + if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { + disableTest = true; + std::cout << "[ WARN ] Test Disabled, component not present\n"; + return; + } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); 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 2056d9e670..a740a8093b 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 { this->omxNode = _nl; }) .isOk()); + if (status == android::hardware::media::omx::V1_0::Status::NAME_NOT_FOUND) { + disableTest = true; + std::cout << "[ WARN ] Test Disabled, component not present\n"; + return; + } ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); ASSERT_NE(omxNode, nullptr); ASSERT_NE(gEnv->getRole().empty(), true) << "Invalid Component Role"; |