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..d526e560e07bd6bfc1f413203d44f9d91eeaf77a 100644
--- a/syzygy/integration_tests/integration_tests.gyp
+++ b/syzygy/integration_tests/integration_tests.gyp
@@ -13,6 +13,34 @@
 # limitations under the License.
 
 {
+  'variables': {
+    # These are source files that are used for generating both:
+    # the integration_tests_dll and integration_tests_clang_dll.
+    # They contain the Asan test cases.
+    'integration_tests_common_source_files': [
+        'asan_interceptors_tests.cc',
+        'asan_page_protection_tests.cc',
+        'deferred_free_tests.cc',
+        'integration_tests_dll.cc',
+    ],
+    # These files are used for generating the integration_tests_dll.
+    'integration_tests_other_files': [
+        'asan_interceptors_tests.h',
+        'asan_page_protection_tests.h',
+        'bb_entry_tests.h',
+        'bb_entry_tests.cc',
+        'behavior_tests.h',
+        'behavior_tests.cc',
+        'coverage_tests.h',
+        'coverage_tests.cc',
+        'deferred_free_tests.h',
+        'integration_tests_dll.def',
+        'integration_tests_dll.h',
+        'integration_tests_dll.rc',
+        'profile_tests.h',
+        'profile_tests.cc',
+    ]
+  },
   'targets': [
     {
       'target_name': 'integration_tests',
@@ -83,28 +111,30 @@
       ],
     },
     {
+      'target_name': 'integration_tests_clang_dll',
+      'type': 'none',
+      'msvs_cygwin_shell': 0,
+      'actions': [
+        {
+          'action_name': 'make_integration_tests_clang',
+          'inputs': ['<@(integration_tests_common_source_files)'],
+          'outputs': ['<(PRODUCT_DIR)/integration_tests_clang_dll.dll'],
+          'action': [
+              '<(python_exe)',
+              'make_integration_tests_clang.py',
+              '--output-dir=<(PRODUCT_DIR)',
+              '--input-files=<(_inputs)',
+              '--target-name=integration_tests_clang_dll',
+          ],
+        },
+      ],
+    },
+    {
       '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',
+        '<@(integration_tests_common_source_files)',
+        '<@(integration_tests_other_files)'
       ],
       'dependencies': [
         '<(src)/syzygy/pe/pe.gyp:export_dll',
@@ -144,7 +174,7 @@
               'RuntimeLibrary':  '0', # 0 = /MT (nondebug static)
               # Disable the iterator debugging for this project. We need to do
               # this because we link against the release version of the C
-              # runtime library, and the iterator debugging relies on some
+              # runtime library1, and the iterator debugging relies on some

[Sébastien Marchand, 2017/07/11 18:57:01]

Fix this.

[njanevsk, 2017/07/14 15:49:15]

Done.

               # functions present only in the debug version of the library.
               'PreprocessorDefinitions': [
                 '_HAS_ITERATOR_DEBUGGING=0',