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

[Sébastien Marchand, 2017/07/10 15:12:43]

As mentioned in one of the previous reviews, please add a comment about these
variables.

[njanevsk, 2017/07/11 18:49:24]

Done.

+        'asan_interceptors_tests.cc',
+        'asan_page_protection_tests.cc',
+        'deferred_free_tests.cc',
+        'integration_tests_dll.cc',
+    ],
+    '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 +107,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',

[Sébastien Marchand, 2017/07/10 15:12:43]

Can you use the target name here? (from above)

[njanevsk, 2017/07/11 18:49:24]

Based on the response I got from the gyp-developers:
https://groups.google.com/forum/#!topic/gyp-developer/yn6YBD9Y45U

It is possible if we add a variable. I prefer to leave it this why cause it is
only used only at one place. What you think?

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

Yep, that's reasonable, let's leave it like this.

+          ],
+        },
+      ],
+    },
+    {
       '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',