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 83d1d5ba8210163f8745ffc770c8e948b6b121b2..f0636fc994a6e0f068326c6fc1f56d3b3bb64910 100644
--- a/syzygy/integration_tests/integration_tests.gyp
+++ b/syzygy/integration_tests/integration_tests.gyp
@@ -13,6 +13,30 @@
 # limitations under the License.
 
 {
+  'variables': {

[Sébastien Marchand, 2017/06/23 18:05:26]

Add comments describing these variables.

+    'integration_tests_source_files': [

[Sébastien Marchand, 2017/06/23 18:05:26]

I'd call this integration_tests_common_source_files and I'll only keep the
'asan_*' and integration_tests_dll.cc in this list. We don't want to compile the
other ones with Clang. (you'll need to make some changes to the code for this to
work!)

+        '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',
+        'behavior_tests.h',
+        'coverage_tests.h',
+        'deferred_free_tests.h',
+        'integration_tests_dll.def',
+        'integration_tests_dll.h',
+        'integration_tests_dll.rc',
+        'profile_tests.h',
+    ]
+  },
   'targets': [
     {
       'target_name': 'integration_tests',
@@ -82,30 +106,28 @@
         },
       ],
     },
+
+    {
+      'target_name': 'integration_tests_clang',
+      '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'],
+          'action': [
+              'make_integration_tests_clang.py',
+              '--build-dir=<(PRODUCT_DIR)',
+              '--input-files=<(_inputs)',
+          ],
+        },
+      ],
+    },
     {
       'target_name': 'integration_tests_dll',
       'type': 'loadable_module',
-      'sources': [
-        'asan_check_tests.h',
-        'asan_interceptors_tests.cc',
-        'asan_interceptors_tests.h',
-        'asan_page_protection_tests.cc',
-        'asan_page_protection_tests.h',
-        'bb_entry_tests.cc',
-        'bb_entry_tests.h',
-        'behavior_tests.cc',
-        'behavior_tests.h',
-        'coverage_tests.cc',
-        'coverage_tests.h',
-        'deferred_free_tests.cc',
-        'deferred_free_tests.h',
-        'integration_tests_dll.cc',
-        'integration_tests_dll.def',
-        'integration_tests_dll.h',
-        'integration_tests_dll.rc',
-        'profile_tests.cc',
-        'profile_tests.h',
-      ],
+      'sources':  ['<@(integration_tests_source_files)', '<@(integration_tests_other_files)'],

[Sébastien Marchand, 2017/06/23 18:05:26]

Split this on multiple lines, like it was before.

       'dependencies': [
         '<(src)/syzygy/pe/pe.gyp:export_dll',
         '<(src)/syzygy/version/version.gyp:syzygy_version',