From 2740a35a7e2af5b373ee4826437a0eda250abf7d Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 2 Dec 2015 08:00:17 -0800 Subject: [PATCH] Exclude platform_test.cc files when platform does not match BUG=564631 Review URL: https://codereview.chromium.org/1493773002 Cr-Original-Commit-Position: refs/heads/master@{#362721} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e96a2edb8efc3bc144917d3c03665161eb68a5c2 --- filename_rules.gypi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/filename_rules.gypi b/filename_rules.gypi index 291bfedb1..bc8175222 100644 --- a/filename_rules.gypi +++ b/filename_rules.gypi @@ -9,16 +9,16 @@ { 'target_conditions': [ ['OS!="win" or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_win(_browsertest|_unittest)?\\.(h|cc)$'], + 'sources/': [ ['exclude', '_win(_browsertest|_unittest|_test)?\\.(h|cc)$'], ['exclude', '(^|/)win/'], ['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ], }], ['OS!="mac" or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_(cocoa|mac|mach)(_unittest)?\\.(h|cc|c|mm?)$'], + 'sources/': [ ['exclude', '_(cocoa|mac|mach)(_unittest|_test)?\\.(h|cc|c|mm?)$'], ['exclude', '(^|/)(cocoa|mac|mach)/'] ], }], ['OS!="ios" or >(nacl_untrusted_build)==1', { - 'sources/': [ ['exclude', '_ios(_unittest)?\\.(h|cc|mm?)$'], + 'sources/': [ ['exclude', '_ios(_unittest|_test)?\\.(h|cc|mm?)$'], ['exclude', '(^|/)ios/'] ], }], ['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', { @@ -31,25 +31,25 @@ # files on non-linux. ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', { 'sources/': [ - ['exclude', '_linux(_unittest)?\\.(h|cc)$'], + ['exclude', '_linux(_unittest|_test)?\\.(h|cc)$'], ['exclude', '(^|/)linux/'], ], }], ['OS!="android" or _toolset=="host" or >(nacl_untrusted_build)==1', { 'sources/': [ - ['exclude', '_android(_unittest)?\\.(h|cc)$'], + ['exclude', '_android(_unittest|_test)?\\.(h|cc)$'], ['exclude', '(^|/)android/'], ], }], ['OS=="win" and >(nacl_untrusted_build)==0', { 'sources/': [ - ['exclude', '_posix(_unittest)?\\.(h|cc)$'], + ['exclude', '_posix(_unittest|_test)?\\.(h|cc)$'], ['exclude', '(^|/)posix/'], ], }], ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { 'sources/': [ - ['exclude', '_chromeos(_unittest)?\\.(h|cc)$'], + ['exclude', '_chromeos(_unittest|_test)?\\.(h|cc)$'], ['exclude', '(^|/)chromeos/'], ], }],