From 8799bcc740e2a68a24cce4d6c8bfeb34edc17984 Mon Sep 17 00:00:00 2001 From: Pawin Vongmasa Date: Fri, 9 Aug 2019 21:49:46 -0700 Subject: [PATCH] OMX VTS: Move device resource files to data/local/tmp Some devices make /sdcard a symbolic link to a non-constant target. The target changes between the setup and the execution, so files pushed to /sdcard during the setup cannot be found when the test runs. Test: vts-tradefed run vts -m VtsHalMediaOmxV1_0Host Bug: 138388013 Bug: 140358266 Change-Id: I824b84ef8570ba501cf8137d695f98c335f92c7b Merged-In: I824b84ef8570ba501cf8137d695f98c335f92c7b --- media/omx/1.0/vts/functional/README.md | 10 +++++----- .../audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | 2 +- .../audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp | 2 +- .../video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | 2 +- .../video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/media/omx/1.0/vts/functional/README.md b/media/omx/1.0/vts/functional/README.md index acffc42943..274b30d8be 100644 --- a/media/omx/1.0/vts/functional/README.md +++ b/media/omx/1.0/vts/functional/README.md @@ -18,17 +18,17 @@ This folder includes test fixtures associated with testing audio encoder and dec usage: -VtsHalMediaOmxV1\_0TargetAudioDecTest -I default -C -R audio_decoder. -P /sdcard/media/ +VtsHalMediaOmxV1\_0TargetAudioDecTest -I default -C -R audio_decoder. -P /data/local/tmp/media/ -VtsHalMediaOmxV1\_0TargetAudioEncTest -I default -C -R audio_encoder. -P /sdcard/media/ +VtsHalMediaOmxV1\_0TargetAudioEncTest -I default -C -R audio_encoder. -P /data/local/tmp/media/ #### video : This folder includes test fixtures associated with testing video encoder and decoder components such as simple encoding of a raw clip or decoding of an elementary stream, end of stream test, timestamp deviations test, flush test and so on. These tests are aimed towards testing the plugin that connects the component to the omx core. usage: -VtsHalMediaOmxV1\_0TargetVideoDecTest -I default -C -R video_decoder. -P /sdcard/media/ +VtsHalMediaOmxV1\_0TargetVideoDecTest -I default -C -R video_decoder. -P /data/local/tmp/media/ -VtsHalMediaOmxV1\_0TargetVideoEncTest -I default -C -R video_encoder. -P /sdcard/media/ +VtsHalMediaOmxV1\_0TargetVideoEncTest -I default -C -R video_encoder. -P /data/local/tmp/media/ -While tesing audio/video encoder, decoder components, test fixtures require input files. These input are files are present in the folder 'res'. Before running the tests all the files in 'res' have to be placed in '/media/sdcard/' or a path of your choice and this path needs to be provided as an argument to the test application \ No newline at end of file +While tesing audio/video encoder, decoder components, test fixtures require input files. These input are files are present in the folder 'res'. Before running the tests all the files in 'res' have to be placed in '/data/local/tmp/media' or a path of your choice and this path needs to be provided as an argument to the test application 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 346605ae26..e60e2333e1 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp @@ -52,7 +52,7 @@ class ComponentTestEnvironment : public ::testing::Environment { virtual void SetUp() {} virtual void TearDown() {} - ComponentTestEnvironment() : instance("default"), res("/sdcard/media/") {} + ComponentTestEnvironment() : instance("default"), res("/data/local/tmp/media/") {} void setInstance(const char* _instance) { instance = _instance; } 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 7a5dceca88..50cf152ca8 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp @@ -52,7 +52,7 @@ class ComponentTestEnvironment : public ::testing::Environment { virtual void SetUp() {} virtual void TearDown() {} - ComponentTestEnvironment() : instance("default"), res("/sdcard/media/") {} + ComponentTestEnvironment() : instance("default"), res("/data/local/tmp/media/") {} void setInstance(const char* _instance) { instance = _instance; } 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 6e2e739cf3..b9e7c37e40 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp @@ -59,7 +59,7 @@ class ComponentTestEnvironment : public ::testing::Environment { virtual void SetUp() {} virtual void TearDown() {} - ComponentTestEnvironment() : instance("default"), res("/sdcard/media/") {} + ComponentTestEnvironment() : instance("default"), res("/data/local/tmp/media/") {} void setInstance(const char* _instance) { instance = _instance; } 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 bbe08435da..dc414cd5ac 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp @@ -70,7 +70,7 @@ class ComponentTestEnvironment : public ::testing::Environment { virtual void SetUp() {} virtual void TearDown() {} - ComponentTestEnvironment() : instance("default"), res("/sdcard/media/") {} + ComponentTestEnvironment() : instance("default"), res("/data/local/tmp/media/") {} void setInstance(const char* _instance) { instance = _instance; }