Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: libyuv_test.gyp

Issue 1685723002: add 'LIBYUV_DISABLE_X86' to msan for unittests (Closed) Base URL: https://chromium.googlesource.com/libyuv/libyuv@master
Patch Set: move conditional for msan to existing block Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« .gitignore ('K') | « libyuv.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libyuv_test.gyp
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 0037106679e1b093c3efe27a0544d8db0e9ee248..0b1c825aaed2a37203223b6f0d07d7ad68c4ed85 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -27,14 +27,6 @@
'export_dependent_settings': [
'<(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': [
# headers
'unit_test/unit_test.h',
@@ -98,10 +90,24 @@
'defines': [
'LIBYUV_NEON'
],
- }],
+ }],
+ # MemorySanitizer does not support assembly code yet.
+ # http://crbug.com/344505
+ [ 'msan == 1', {
+ 'defines': [
+ 'LIBYUV_DISABLE_X86',
+ ],
+ }],
], # 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',
'type': 'executable',
« .gitignore ('K') | « libyuv.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698