summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:01:15 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:01:15 +0000
commitb081d6c2216f187cd27b96f24489f8fbb038c8f1 (patch)
treebfd3ffe97b5e7d7344e4bbb44243cc26b4fcf268 /content
parent1e545b6d207e74b4ef3398fbf8caa760ae649c78 (diff)
downloadchromium_src-b081d6c2216f187cd27b96f24489f8fbb038c8f1.zip
chromium_src-b081d6c2216f187cd27b96f24489f8fbb038c8f1.tar.gz
chromium_src-b081d6c2216f187cd27b96f24489f8fbb038c8f1.tar.bz2
Add a cros autotest runner for omx_video_decode_accelerator_unittest (on ARM).
Also fixed a bug in v_d_a_unittest.cc where specifying the known switch would fall-through to the FATAL for unknown switches. BUG=109828 TEST=Manual run passed: emerge-tegra2_kaen chromeos-chrome && run_remote_tests.sh --remote=<tegra2IP> --use_emerged OMXTest Review URL: https://chromiumcodereview.appspot.com/9150023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/gpu/media/video_decode_accelerator_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index 7d98c5c..688b823 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -945,7 +945,8 @@ TEST_P(VideoDecodeAcceleratorTest, TestSimpleDecode) {
// Read in the video data.
std::string data_str;
- CHECK(file_util::ReadFileToString(FilePath(test_video_file), &data_str));
+ CHECK(file_util::ReadFileToString(FilePath(test_video_file), &data_str))
+ << "test_video_file: " << test_video_file;
// Initialize the rendering helper.
base::Thread rendering_thread("EglRenderingVDAClientThread");
@@ -1147,6 +1148,7 @@ int main(int argc, char **argv) {
it != switches.end(); ++it) {
if (it->first == "test_video_data") {
test_video_data = it->second.c_str();
+ continue;
}
LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
}