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

syzygy/integration_tests/integration_tests.gyp

 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # 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',
       'type': 'executable',
       'sources': [
         'integration_tests.rc',
         'instrument_integration_test.cc',
         '<(src)/syzygy/testing/run_all_unittests.cc',
       ],
       'dependencies': [
@@ skipping 50 matching lines @@
             '<(python_exe)',
             '<(src)/syzygy/build/copy_laa.py',
             '--input=$(OutDir)\\integration_tests.exe',
             '--output=$(OutDir)\\integration_tests_4g.exe',
             '--overwrite',
           ],
         },
       ],
     },
     {
+      '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',
         '<(src)/syzygy/version/version.gyp:syzygy_version',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           # Asan agent is compiled without large address spaces to allow a
           # memory optimization on the shadow memory. Agents should run in both
           # modes, thus in the long term, we should remove this.
@@ skipping 19 matching lines @@
               'SetChecksum': 'true',
             },
             'VCCLCompilerTool': {
               'BasicRuntimeChecks': '0',
               # Asan needs the application to be linked with the release static
               # runtime library. Otherwise, memory allocation functions are
               # wrapped and hide memory bugs like overflow/underflow.
               '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',
                 'NDEBUG',
               ],
               # The DEBUG preprocessor flag has to be explicitely undefined in
               # order to avoid using some code only available in the debug
               # version of the runtime library (see comment above about that).
               'AdditionalOptions': [
                 '/U_DEBUG'
@@ skipping 53 matching lines @@
           # Asan agent is compiled without large address spaces to allow a
           # memory optimization on the shadow memory. Agents should run in both
           # modes, thus in the long term, we should remove this.
           # Disable support for large address spaces.
           'LargeAddressAware': 1,
         },
       },
     },
   ],
 }