Commit 6ea37553 authored by Frank Barchard's avatar Frank Barchard

add 'LIBYUV_DISABLE_X86' to msan for unittests

R=harryjin@google.com
BUG=libyuv:564

Review URL: https://codereview.chromium.org/1685723002 .
parent fc2adcfa
...@@ -77,6 +77,8 @@ pin-log.txt ...@@ -77,6 +77,8 @@ pin-log.txt
/tools/generate_library_loader /tools/generate_library_loader
/tools/gn /tools/gn
/tools/grit /tools/grit
/tools/gritsettings/README
/tools/gritsettings/resource_ids
/tools/gyp /tools/gyp
/tools/isolate_driver.py /tools/isolate_driver.py
/tools/memory /tools/memory
...@@ -87,6 +89,19 @@ pin-log.txt ...@@ -87,6 +89,19 @@ pin-log.txt
/tools/swarming_client /tools/swarming_client
/tools/tsan_suppressions /tools/tsan_suppressions
/tools/valgrind /tools/valgrind
/tools/valgrind-libyuv/libyuv_tests.bat
/tools/valgrind-libyuv/libyuv_tests.py
/tools/valgrind-libyuv/libyuv_tests.sh
/tools/valgrind-libyuv/memcheck/OWNERS
/tools/valgrind-libyuv/memcheck/PRESUBMIT.py
/tools/valgrind-libyuv/memcheck/suppressions.txt
/tools/valgrind-libyuv/memcheck/suppressions_mac.txt
/tools/valgrind-libyuv/memcheck/suppressions_win32.txt
/tools/valgrind-libyuv/tsan/OWNERS
/tools/valgrind-libyuv/tsan/PRESUBMIT.py
/tools/valgrind-libyuv/tsan/suppressions.txt
/tools/valgrind-libyuv/tsan/suppressions_mac.txt
/tools/valgrind-libyuv/tsan/suppressions_win32.txt
/tools/vim /tools/vim
/tools/win /tools/win
......
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1573 Version: 1574
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1573 #define LIBYUV_VERSION 1574
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
# Change type to 'shared_library' to build .so or .dll files. # Change type to 'shared_library' to build .so or .dll files.
'type': 'static_library', 'type': 'static_library',
'variables': { 'variables': {
# 'optimize': 'max', # enable O2 and ltcg. 'optimize': 'max', # enable O2 and ltcg.
}, },
# Allows libyuv.a redistributable library without external dependencies. # Allows libyuv.a redistributable library without external dependencies.
'standalone_static_library': 1, 'standalone_static_library': 1,
......
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
'export_dependent_settings': [ 'export_dependent_settings': [
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
], ],
'defines': [
# Enable the following 3 macros to turn off assembly for specified CPU.
# 'LIBYUV_DISABLE_X86',
# 'LIBYUV_DISABLE_NEON',
# 'LIBYUV_DISABLE_MIPS',
# Enable the following macro to build libyuv as a shared library (dll).
# 'LIBYUV_USING_SHARED_LIBRARY',
],
'sources': [ 'sources': [
# headers # headers
'unit_test/unit_test.h', 'unit_test/unit_test.h',
...@@ -99,9 +91,23 @@ ...@@ -99,9 +91,23 @@
'LIBYUV_NEON' 'LIBYUV_NEON'
], ],
}], }],
# MemorySanitizer does not support assembly code yet.
# http://crbug.com/344505
[ 'msan == 1', {
'defines': [
'LIBYUV_DISABLE_X86',
],
}],
], # conditions ], # conditions
'defines': [
# Enable the following 3 macros to turn off assembly for specified CPU.
# 'LIBYUV_DISABLE_X86',
# 'LIBYUV_DISABLE_NEON',
# 'LIBYUV_DISABLE_MIPS',
# Enable the following macro to build libyuv as a shared library (dll).
# 'LIBYUV_USING_SHARED_LIBRARY',
],
}, },
{ {
'target_name': 'compare', 'target_name': 'compare',
'type': 'executable', 'type': 'executable',
......
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