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..ef6e1deb860482e507a2b3c4365dfe2b1230b4b8 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': [
+        '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,29 @@
       ],
     },
     {
+      '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': [
+              'make_integration_tests_clang.py',

[Sébastien Marchand, 2017/07/07 17:31:11]

You need sys.executable before that

[Sébastien Marchand, 2017/07/07 17:31:59]

Well, in fact you need:
            '<(python_exe)',

[njanevsk, 2017/07/07 18:47:52]

Done.

[njanevsk, 2017/07/07 18:47:53]

Done.

+              '--output-dir=<(PRODUCT_DIR)',
+              '--input-files=<(_inputs)',

[Sébastien Marchand, 2017/07/07 17:41:38]

This doesn't work, this gives the following command line:
make_integration_tests_clang.py --output-dir=..\..\out\Release
--input-files=asan_interceptors_tests.cc asan_page_protection_tests.cc
deferred_free_tests.cc integration_tests_dll.cc
--target-name=integration_tests_clang_dll

all the source files are separated by a space so the option parser can't parse
this.

[njanevsk, 2017/07/07 18:47:52]

The code works. The problem was in the python script. Here is a link to the CL
with the fixed python script:
https://codereview.chromium.org/2977433002/

+              '--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',