diff options
author | hbos <hbos@chromium.org> | 2015-10-13 09:27:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 16:45:19 +0000 |
commit | e409ed4bb768e07371b5e4ebcf107c023796ac57 (patch) | |
tree | 008fa9015a91f8563e7874f792a48e622a819494 | |
parent | f83192ddfb9075203f4e2d326d4b70c6688a48c6 (diff) | |
download | chromium_src-e409ed4bb768e07371b5e4ebcf107c023796ac57.zip chromium_src-e409ed4bb768e07371b5e4ebcf107c023796ac57.tar.gz chromium_src-e409ed4bb768e07371b5e4ebcf107c023796ac57.tar.bz2 |
openh264_unittests empty dummy test added.
This will enable trybots to run this new test binary (openh264_unittests) for a future CL that adds actual test code and more to it.
In the follow-up CL OpenH264 will be pulled in (adding third_party/openh264/src) and build files and test code will be added. That CL needs the trybots to run its test code.
BUG=500605
Review URL: https://codereview.chromium.org/1394983003
Cr-Commit-Position: refs/heads/master@{#353769}
-rw-r--r-- | BUILD.gn | 1 | ||||
-rw-r--r-- | build/all.gyp | 1 | ||||
-rw-r--r-- | build/gn_migration.gypi | 1 | ||||
-rw-r--r-- | third_party/openh264/DEPS | 3 | ||||
-rw-r--r-- | third_party/openh264/LICENSE | 23 | ||||
-rw-r--r-- | third_party/openh264/OWNERS | 1 | ||||
-rw-r--r-- | third_party/openh264/README.chromium | 20 | ||||
-rw-r--r-- | third_party/openh264/tests/BUILD.gn | 20 | ||||
-rw-r--r-- | third_party/openh264/tests/openh264_unittests.cc | 20 | ||||
-rw-r--r-- | third_party/openh264/tests/openh264_unittests.gyp | 22 |
10 files changed, 112 insertions, 0 deletions
@@ -73,6 +73,7 @@ group("both_gn_and_gyp") { "//skia:skia_unittests", "//sql:sql_unittests", "//sync:sync_unit_tests", + "//third_party/openh264/tests:openh264_unittests", "//ui/base:ui_base_unittests", "//ui/gfx:gfx_unittests", "//url:url_unittests", diff --git a/build/all.gyp b/build/all.gyp index df38f99..8eabf88 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -30,6 +30,7 @@ '../testing/gtest.gyp:*', '../third_party/icu/icu.gyp:*', '../third_party/libxml/libxml.gyp:*', + '../third_party/openh264/tests/openh264_unittests.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../ui/accessibility/accessibility.gyp:*', diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 2e83a2b..1c97307 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -183,6 +183,7 @@ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests', + '../third_party/openh264/tests/openh264_unittests.gyp:*', '../third_party/pdfium/samples/samples.gyp:pdfium_diff', '../third_party/pdfium/samples/samples.gyp:pdfium_test', '../third_party/smhasher/smhasher.gyp:pmurhash', diff --git a/third_party/openh264/DEPS b/third_party/openh264/DEPS new file mode 100644 index 0000000..d2f34d2 --- /dev/null +++ b/third_party/openh264/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + '+testing', +] diff --git a/third_party/openh264/LICENSE b/third_party/openh264/LICENSE new file mode 100644 index 0000000..8e730c4 --- /dev/null +++ b/third_party/openh264/LICENSE @@ -0,0 +1,23 @@ +Copyright (c) 2013, Cisco Systems +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file diff --git a/third_party/openh264/OWNERS b/third_party/openh264/OWNERS new file mode 100644 index 0000000..88f08e9 --- /dev/null +++ b/third_party/openh264/OWNERS @@ -0,0 +1 @@ +hbos@chromium.org diff --git a/third_party/openh264/README.chromium b/third_party/openh264/README.chromium new file mode 100644 index 0000000..4e1893b --- /dev/null +++ b/third_party/openh264/README.chromium @@ -0,0 +1,20 @@ +Name: OpenH264 +Short Name: openh264 +URL: http://www.openh264.org/ +Version: v.1.4.0 +License: 2-Clause BSD +License File: LICENSE +Security Critical: yes + +Description: +Cisco's H.264 video codec implementation. + + Important: + While the OpenH264 source code is under BSD license, other license(s) also + apply for builds (MPEG-LA patent), see www.openh264.org for more information. + +Local Modifications: +N/A + + Note: OpenH264 src has not yet been pulled in. A proper README.chromium file + was added anyway due to presubmit check. diff --git a/third_party/openh264/tests/BUILD.gn b/third_party/openh264/tests/BUILD.gn new file mode 100644 index 0000000..5441a99 --- /dev/null +++ b/third_party/openh264/tests/BUILD.gn @@ -0,0 +1,20 @@ +# Copyright 2015 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. + +import("//testing/test.gni") + +test("openh264_unittests") { + include_dirs = [ + "//", + "//third_party", + ] + + deps = [ + "//testing/gtest", + ] + + sources = [ + "openh264_unittests.cc", + ] +} diff --git a/third_party/openh264/tests/openh264_unittests.cc b/third_party/openh264/tests/openh264_unittests.cc new file mode 100644 index 0000000..443d27f --- /dev/null +++ b/third_party/openh264/tests/openh264_unittests.cc @@ -0,0 +1,20 @@ +// Copyright 2015 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 openh264 { + +class OpenH264Tests : public testing::Test { +}; + +TEST_F(OpenH264Tests, DummyTestAlwaysPass) { +} + +} // namespace openh264 + +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/third_party/openh264/tests/openh264_unittests.gyp b/third_party/openh264/tests/openh264_unittests.gyp new file mode 100644 index 0000000..72143a3 --- /dev/null +++ b/third_party/openh264/tests/openh264_unittests.gyp @@ -0,0 +1,22 @@ +# Copyright 2015 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. + +{ + 'targets': [ + { + 'target_name': 'openh264_unittests', + 'type': '<(gtest_target_type)', + 'include_dirs': [ + '<(DEPTH)', + '<(DEPTH)/third_party', + ], + 'dependencies': [ + '<(DEPTH)/testing/gtest.gyp:gtest', + ], + 'sources': [ + 'openh264_unittests.cc', + ], + }, + ], +} |