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

syzygy/integration_tests/integration_tests.gyp

Index: syzygy/integration_tests/integration_tests.gyp
diff --git a/syzygy/integration_tests/integration_tests.gyp b/syzygy/integration_tests/integration_tests.gyp
index f0636fc994a6e0f068326c6fc1f56d3b3bb64910..baa2b5ffe91930abefba304d19078f3acf1939fe 100644
--- a/syzygy/integration_tests/integration_tests.gyp
+++ b/syzygy/integration_tests/integration_tests.gyp
@@ -14,27 +14,27 @@
 
 {
   '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': [
@@ -106,19 +106,18 @@
         },
       ],
     },
-
     {
-      '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)',
           ],
         },
@@ -127,8 +126,12 @@
     {
       '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',
       ],