Moved source files into a list variable and add a custom build target to compile the integration te…

syzygy/integration_tests/integration_tests.gyp

 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 {
   'variables': {
-    'integration_tests_source_files': [
+    'integration_tests_common_source_files': [
         'asan_interceptors_tests.cc',
         'asan_page_protection_tests.cc',
-        'bb_entry_tests.cc',
-        'behavior_tests.cc',
-        'coverage_tests.cc',
-        'deferred_free_tests.cc',
         'integration_tests_dll.cc',
-        'profile_tests.cc',
     ],
     'integration_tests_other_files': [
         'asan_interceptors_tests.h',
         'asan_page_protection_tests.h',
         'bb_entry_tests.h',
+                'bb_entry_tests.cc',

[Sébastien Marchand, 2017/07/04 18:09:04]

Fix the indentation. This is something that comes up pretty often in your CLs
and could easily be avoided by doing a self review before asking us for one.

         'behavior_tests.h',
+                'behavior_tests.cc',
         'coverage_tests.h',
+                'coverage_tests.cc',
         'deferred_free_tests.h',
+                'deferred_free_tests.cc',
         'integration_tests_dll.def',
         'integration_tests_dll.h',
         'integration_tests_dll.rc',
         'profile_tests.h',
+                'profile_tests.cc',
     ]
   },
   'targets': [
     {
       'target_name': 'integration_tests',
       'type': 'executable',
       'sources': [
         'integration_tests.rc',
         'instrument_integration_test.cc',
         '<(src)/syzygy/testing/run_all_unittests.cc',
@@ skipping 51 matching lines @@
           'action': [
             '<(python_exe)',
             '<(src)/syzygy/build/copy_laa.py',
             '--input=$(OutDir)\\integration_tests.exe',
             '--output=$(OutDir)\\integration_tests_4g.exe',
             '--overwrite',
           ],
         },
       ],
     },
-
     {
-      'target_name': 'integration_tests_clang',
+      'target_name': 'integration_tests_clang_dll',
       'type': 'none',
       'msvs_cygwin_shell': 0,
       'actions': [
         {
           'action_name': 'make_integration_tests_clang',
-          'inputs': ['<@(integration_tests_source_files)'],
-          'outputs': ['<(PRODUCT_DIR)/integration_tests_clang.exe'],
+          'inputs': ['<@(integration_tests_common_source_files)'],
+          'outputs': ['<(PRODUCT_DIR)/integration_tests_clang_dll.dll'],
           'action': [
               'make_integration_tests_clang.py',
-              '--build-dir=<(PRODUCT_DIR)',
+              '--output-dir=<(PRODUCT_DIR)',
               '--input-files=<(_inputs)',
           ],
         },
       ],
     },
     {
       'target_name': 'integration_tests_dll',
       'type': 'loadable_module',
-      'sources':  ['<@(integration_tests_source_files)', '<@(integration_tests_other_files)'],
+      'sources':  [
+            '<@(integration_tests_common_source_files)',
+                '<@(integration_tests_other_files)'

[Sébastien Marchand, 2017/07/04 18:09:04]

Same issue here, and you're using tabs instead of spaces.

+          ],
       'dependencies': [
+                '<(src)/base/base.gyp:base',

[Sébastien Marchand, 2017/07/04 18:09:04]

Ditto.

         '<(src)/syzygy/pe/pe.gyp:export_dll',
         '<(src)/syzygy/version/version.gyp:syzygy_version',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           # Asan agent is compiled without large address spaces to allow a
           # memory optimization on the shadow memory. Agents should run in both
           # modes, thus in the long term, we should remove this.
           # Disable support for large address spaces.
           'LargeAddressAware': 1,
@@ skipping 91 matching lines @@
           # Asan agent is compiled without large address spaces to allow a
           # memory optimization on the shadow memory. Agents should run in both
           # modes, thus in the long term, we should remove this.
           # Disable support for large address spaces.
           'LargeAddressAware': 1,
         },
       },
     },
   ],
 }