[coverage] Filter some files from instrumentation.

build/standalone.gypi

Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 5269b95f64dbd9cf2f6ecba7c9c0d8764a4bf550..5011684aa836c6bca0f23a5f87ea59ec721b68cf 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -48,6 +48,12 @@
     'release_extra_cflags%': '',
     'variables': {
       'variables': {
+        # goma settings.
+        # 1 to use goma.
+        # If no gomadir is set, it uses the default gomadir.
+        'use_goma%': 0,
+        'gomadir%': '',
+
         'variables': {
           'conditions': [
             ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \
@@ -70,12 +76,23 @@
 
         # Instrument for code coverage with gcov.
         'coverage%': 0,
+
+        'conditions': [
+          # Set default gomadir.
+          ['OS=="win"', {
+            'gomadir': 'c:\\goma\\goma-win',
+          }, {
+            'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
+          }],
+        ],
       },
       'base_dir%': '<(base_dir)',
       'host_arch%': '<(host_arch)',
       'target_arch%': '<(target_arch)',
       'v8_target_arch%': '<(target_arch)',
       'coverage%': '<(coverage)',
+      'use_goma%': '<(use_goma)',
+      'gomadir%': '<(gomadir)',
       'asan%': 0,
       'lsan%': 0,
       'msan%': 0,
@@ -104,22 +121,10 @@
       # TODO(machenbach): Only configured for windows.
       'fastbuild%': 0,
 
-      # goma settings.
-      # 1 to use goma.
-      # If no gomadir is set, it uses the default gomadir.
-      'use_goma%': 0,
-      'gomadir%': '',
-
       # Check if valgrind directories are present.
       'has_valgrind%': '<!pymod_do_main(has_valgrind)',
 
       'conditions': [
-        # Set default gomadir.
-        ['OS=="win"', {
-          'gomadir': 'c:\\goma\\goma-win',
-        }, {
-          'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
-        }],
         ['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390" and host_arch!="s390x" and \
           coverage==0', {
           'host_clang%': 1,
@@ -144,6 +149,13 @@
         }, {
           'test_isolation_mode%': 'noop',
         }],
+

[Michael Achenbach, 2016/02/24 15:45:48]

Moved this one variable nesting level higher, so that clang is available in the
conditions on the lower level.

+        ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and \
+          (v8_target_arch!="x87" and v8_target_arch!="x32") and coverage==0', {
+          'clang%': 1,
+        }, {
+          'clang%': 0,
+        }],

[JF, 2016/02/24 16:59:12]

I think this breaks gclient sync:


gyp: name 'v8_target_arch' is not defined while evaluating condition
'(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and 
         (v8_target_arch!="x87" and v8_target_arch!="x32") and coverage==0' in
/media/jfb/ssd/v8/v8/build/all.gyp
Error: Command '/usr/bin/python v8/build/gyp_v8' returned non-zero exit status 1
in /media/jfb/ssd/v8

       ],
     },
     'base_dir%': '<(base_dir)',
@@ -155,6 +167,7 @@
     'werror%': '-Werror',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
+    'clang%': '<(clang)',
     'asan%': '<(asan)',
     'lsan%': '<(lsan)',
     'msan%': '<(msan)',
@@ -233,12 +246,6 @@
       }, {
         'v8_enable_gdbjit%': 0,
       }],
-      ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and \
-        (v8_target_arch!="x87" and v8_target_arch!="x32") and coverage==0', {
-        'clang%': 1,
-      }, {
-        'clang%': 0,
-      }],
       ['asan==1 or lsan==1 or msan==1 or tsan==1', {
         'clang%': 1,
         'use_allocator%': 'none',
@@ -362,6 +369,23 @@
         'host_cc': '<!(which gcc)',
         'host_cxx': '<!(which g++)',
       }],
+      ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
+        'conditions': [
+          ['coverage==1', {
+            'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py <(gomadir)/gomacc',
+          }, {
+            'cc_wrapper': '<(gomadir)/gomacc',
+          }],
+        ],
+      }, {
+        'conditions': [
+          ['coverage==1', {
+            'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py',
+          }, {
+            'cc_wrapper': 0,
+          }],
+        ],
+      }],
     ],
     # Default ARM variable settings.
     'arm_version%': 'default',
@@ -1261,12 +1285,12 @@
     # TODO(yyanagisawa): supports GENERATOR==make
     #  make generator doesn't support CC_wrapper without CC
     #  in make_global_settings yet.
-    ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
+    ['cc_wrapper!=0', {
       'make_global_settings': [
-       ['CC_wrapper', '<(gomadir)/gomacc'],
-       ['CXX_wrapper', '<(gomadir)/gomacc'],
-       ['CC.host_wrapper', '<(gomadir)/gomacc'],
-       ['CXX.host_wrapper', '<(gomadir)/gomacc'],
+       ['CC_wrapper', '<(cc_wrapper)'],
+       ['CXX_wrapper', '<(cc_wrapper)'],
+       ['CC.host_wrapper', '<(cc_wrapper)'],
+       ['CXX.host_wrapper', '<(cc_wrapper)'],
       ],
     }],
     ['use_lto==1', {