summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 01:42:04 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 01:42:04 +0000
commitda4a37dfae588fc100816d1d3edf4b9772ac688c (patch)
tree3ca59c58a9547eea929d12af2710ce085ef4683f /media
parentf3ec67efb64c11ea618d8e14c4932bda1ed6f5b7 (diff)
downloadchromium_src-da4a37dfae588fc100816d1d3edf4b9772ac688c.zip
chromium_src-da4a37dfae588fc100816d1d3edf4b9772ac688c.tar.gz
chromium_src-da4a37dfae588fc100816d1d3edf4b9772ac688c.tar.bz2
Checking in the beginnings of omx_unittests.
Also renamed omx_wrapper to the simpler (and more accurate!) omx. BUG=n/a TEST=n/a Review URL: http://codereview.chromium.org/467055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp19
-rw-r--r--media/omx/omx_unittest.cc13
-rw-r--r--media/omx/run_all_unittests.cc9
3 files changed, 38 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 17731213..ef7d524 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -244,7 +244,7 @@
'target_name': 'omx_test',
'type': 'executable',
'dependencies': [
- 'omx_wrapper',
+ 'omx',
'../base/base.gyp:base',
'../third_party/openmax/openmax.gyp:il',
],
@@ -253,7 +253,21 @@
],
},
{
- 'target_name': 'omx_wrapper',
+ 'target_name': 'omx_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ 'omx',
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'sources': [
+ 'omx/omx_unittest.cc',
+ 'omx/run_all_unittests.cc',
+ ],
+ },
+ {
+ 'target_name': 'omx',
'type': '<(library)',
'dependencies': [
'../base/base.gyp:base',
@@ -262,7 +276,6 @@
'sources': [
'omx/input_buffer.cc',
'omx/input_buffer.h',
- 'omx/omx_test.cc',
'omx/omx_codec.cc',
'omx/omx_codec.h',
],
diff --git a/media/omx/omx_unittest.cc b/media/omx/omx_unittest.cc
new file mode 100644
index 0000000..d70aef6
--- /dev/null
+++ b/media/omx/omx_unittest.cc
@@ -0,0 +1,13 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace media {
+
+TEST(OmxTest, Pass) {
+ // TODO(scherkus): fill in with some sample OpenMAX tests.
+}
+
+} // namespace media
diff --git a/media/omx/run_all_unittests.cc b/media/omx/run_all_unittests.cc
new file mode 100644
index 0000000..841b353
--- /dev/null
+++ b/media/omx/run_all_unittests.cc
@@ -0,0 +1,9 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/test/test_suite.h"
+
+int main(int argc, char** argv) {
+ return TestSuite(argc, argv).Run();
+}