Skip to content

GitLab

T
tangled
Commit f6cba754 authored by rouslan's avatar rouslan Committed by Commit bot
Browse files
Options

Revert of Add build targets for Opus tests. (patchset #5 id:80001 of... 

Revert of Add build targets for Opus tests. (patchset #5 id:80001 of https://codereview.chromium.org/890473002/)

Reason for revert:
Broke Mac GN (dbg) bot.

[169/1394] STAMP obj/third_party/cacheinvalidation/cacheinvalidation_unittests.inputdeps.stamp
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang -MMD -MF obj/third_party/opus/src/tests/test_opus_decode.test_opus_decode.o.d -DCHROMIUM_BUILD -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_OPENSSL=1 -DNO_TCMALLOC -DDISABLE_NACL -DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_WIFI_BOOTSTRAPPING=1 -DENABLE_REMOTING=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_HIDPI=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DCR_CLANG_REVISION=223108 -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -I../.. -Igen -I../../third_party/opus/src/celt -I../../third_party/opus/src/silk -I../../third_party/opus/src/include -fno-strict-aliasing -fstack-protector-all -arch x86_64 -fcolor-diagnostics -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wnewline-eof -Wno-c++11-narrowing -Wno-char-subscripts -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-reserved-user-defined-literal -Wno-inconsistent-missing-override -fvisibility=hidden -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -O0 -g2 -Wno-absolute-value -std=c99 -c ../../third_party/opus/src/tests/test_opus_decode.c -o obj/third_party/opus/src/tests/test_opus_decode.test_opus_decode.o
../../third_party/opus/src/tests/test_opus_decode.c:138:64: error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
         out_samples = opus_decode(dec[t], packet, 0, 0, 0, fec);
                                                      ~        ^
1 error generated.
ninja: build stopped: subcommand failed.

http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/3538

Original issue's description:
> Add build targets for Opus tests.
>
> test_opus_api, test_opus_encode, test_opus_decode, and test_opus_padding
> can be run directly, with no command-line options, and they print out
> "OK" during the test and an overall status message such as
> "All API tests passed." or "Tests completed successfully." at the end.
>
> The celt component has several unit tests. I didn't add build targets
> for them because some of them don't print any output, so you'd need a
> test harness script to examine their exit status.
>
> R=henrika@chromium.org,sergeyu@chromium.org
> BUG=452984
>
> Committed: https://crrev.com/bfcc6156a8f2107ecd70445b08e60299737caffa
> Cr-Commit-Position: refs/heads/master@{#313964}

TBR=henrika@chromium.org,sergeyu@chromium.org,brettw@chromium.org,wtc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=452984

Review URL: https://codereview.chromium.org/888963002

Cr-Commit-Position: refs/heads/master@{#313965}
parent bfcc6156
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 153 deletions
third_party/opus/BUILD.gn
View file @ f6cba754
......@@ -4,7 +4,6 @@
import("//build/config/arm.gni")
import("//build/config/mips.gni")
import("//testing/test.gni")
# If fixed point implementation shall be used (otherwise float).
# TODO(wtc): change "mipselx" to "mipsel" in this file when the compilation
......@@ -27,23 +26,6 @@ config("opus_config") {
include_dirs = [ "src/include" ]
}
config("opus_test_config") {
include_dirs = [
"src/celt",
"src/silk",
]
if (is_win) {
defines = [ "inline=__inline" ]
}
if (is_android) {
libs = [ "log" ]
}
if (is_clang) {
cflags = [ "-Wno-absolute-value" ]
}
}
if (use_opus_rtcd) {
action("convert_rtcd_assembler") {
script = "convert_rtcd_assembler.py"
......@@ -191,90 +173,50 @@ executable("opus_compare") {
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
deps = [
":opus",
]
}
executable("opus_demo") {
sources = [
"src/src/opus_demo.c",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
deps = [
":opus",
]
}
test("test_opus_api") {
sources = [
"src/tests/test_opus_api.c",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
deps = [
":opus",
]
}
configs += [ "//build/config/compiler:no_chromium_code" ]
test("test_opus_encode") {
sources = [
"src/tests/test_opus_encode.c",
include_dirs = [
"src/celt",
"src/silk",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
if (is_win) {
defines = [ "inline=__inline" ]
}
if (is_android) {
libs = [ "log" ]
}
if (is_clang) {
cflags = [ "-Wno-absolute-value" ]
}
deps = [
":opus",
]
}
test("test_opus_decode") {
executable("opus_demo") {
sources = [
"src/tests/test_opus_decode.c",
"src/src/opus_demo.c",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
deps = [
":opus",
]
}
configs += [ "//build/config/compiler:no_chromium_code" ]
test("test_opus_padding") {
sources = [
"src/tests/test_opus_padding.c",
include_dirs = [
"src/celt",
"src/silk",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
":opus_test_config",
]
if (is_win) {
defines = [ "inline=__inline" ]
}
if (is_android) {
libs = [ "log" ]
}
if (is_clang) {
cflags = [ "-Wno-absolute-value" ]
}
deps = [
":opus",
......
third_party/opus/opus.gyp
View file @ f6cba754
......@@ -31,33 +31,6 @@
}],
],
},
'target_defaults': {
'target_conditions': [
['_type=="executable"', {
# All of the executable targets depend on 'opus'. Unfortunately the
# 'dependencies' block cannot be inherited via 'target_defaults'.
'include_dirs': [
'src/celt',
'src/silk',
],
'conditions': [
['OS == "win"', {
'defines': [
'inline=__inline',
],
}],
['OS=="android"', {
'libraries': [
'-llog',
],
}],
['clang==1', {
'cflags': [ '-Wno-absolute-value' ],
}]
],
}],
],
},
'targets': [
{
'target_name': 'opus',
......@@ -178,9 +151,30 @@
'dependencies': [
'opus'
],
'conditions': [
['OS == "win"', {
'defines': [
'inline=__inline',
],
}],
['OS=="android"', {
'link_settings': {
'libraries': [
'-llog',
],
},
}],
['clang==1', {
'cflags': [ '-Wno-absolute-value' ],
}]
],
'sources': [
'src/src/opus_compare.c',
],
'include_dirs': [
'src/celt',
'src/silk',
],
}, # target opus_compare
{
'target_name': 'opus_demo',
......@@ -188,49 +182,30 @@
'dependencies': [
'opus'
],
'sources': [
'src/src/opus_demo.c',
],
}, # target opus_demo
{
'target_name': 'test_opus_api',
'type': 'executable',
'dependencies': [
'opus'
],
'sources': [
'src/tests/test_opus_api.c',
],
}, # target test_opus_api
{
'target_name': 'test_opus_encode',
'type': 'executable',
'dependencies': [
'opus'
],
'sources': [
'src/tests/test_opus_encode.c',
],
}, # target test_opus_encode
{
'target_name': 'test_opus_decode',
'type': 'executable',
'dependencies': [
'opus'
'conditions': [
['OS == "win"', {
'defines': [
'inline=__inline',
],
}],
['OS=="android"', {
'link_settings': {
'libraries': [
'-llog',
],
},
}],
['clang==1', {
'cflags': [ '-Wno-absolute-value' ],
}]
],
'sources': [
'src/tests/test_opus_decode.c',
],
}, # target test_opus_decode
{
'target_name': 'test_opus_padding',
'type': 'executable',
'dependencies': [
'opus'
'src/src/opus_demo.c',
],
'sources': [
'src/tests/test_opus_padding.c',
'include_dirs': [
'src/celt',
'src/silk',
],
}, # target test_opus_padding
}, # target opus_demo
]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment