Separate the dependencies in the gyp file and use conditional inclusion.

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 d1af84967e94d12e32c15c9b5778a5bcbc2c080e..32c418884b5d177dc6bac8d9a29e2aa45f04ef4b 100644
--- a/syzygy/integration_tests/integration_tests.gyp
+++ b/syzygy/integration_tests/integration_tests.gyp
@@ -39,7 +39,22 @@
         'integration_tests_dll.rc',
         'profile_tests.h',
         'profile_tests.cc',
-    ]
+    ],
+    # These are dependencies that should be included only when compiling
+    # for 32 bits.
+    'integration_tests_32bit_dependencies': [

[Sébastien Marchand, 2017/08/08 15:01:03]

No need to put this in a global variable as it's only used at one place, just
put it there and skip using this variable.

[njanevsk, 2017/08/10 17:15:00]

Done.

+      'integration_tests_dll',
+      '<(src)/syzygy/agent/basic_block_entry/basic_block_entry.gyp:'
+          'basic_block_entry_client',
+      '<(src)/syzygy/agent/call_trace/call_trace.gyp:call_trace_client',
+      '<(src)/syzygy/agent/coverage/coverage.gyp:coverage_client',
+      '<(src)/syzygy/agent/profiler/profiler.gyp:profile_client',
+      '<(src)/syzygy/grinder/grinder.gyp:grinder_lib',
+      '<(src)/syzygy/instrument/instrument.gyp:instrument_lib',
+      '<(src)/syzygy/pe/pe.gyp:pe_unittest_utils',
+      '<(src)/syzygy/trace/common/common.gyp:trace_unittest_utils',
+      '<(src)/syzygy/trace/service/service.gyp:call_trace_service_exe',
+    ],
   },
   'targets': [
     {
@@ -53,28 +68,25 @@
       'dependencies': [
         'crash_for_exception_harness',
         'integration_tests_clang_dll',
-        'integration_tests_dll',
         'integration_tests_harness',
         '<(src)/base/base.gyp:test_support_base',
         '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl',
-        '<(src)/syzygy/agent/basic_block_entry/basic_block_entry.gyp:'
-            'basic_block_entry_client',
-        '<(src)/syzygy/agent/call_trace/call_trace.gyp:call_trace_client',
-        '<(src)/syzygy/agent/coverage/coverage.gyp:coverage_client',
-        '<(src)/syzygy/agent/profiler/profiler.gyp:profile_client',
         '<(src)/syzygy/core/core.gyp:core_unittest_utils',
-        '<(src)/syzygy/grinder/grinder.gyp:grinder_lib',
-        '<(src)/syzygy/instrument/instrument.gyp:instrument_lib',
-        '<(src)/syzygy/pe/pe.gyp:pe_unittest_utils',
         '<(src)/syzygy/poirot/poirot.gyp:poirot_lib',
         '<(src)/syzygy/testing/testing.gyp:testing_lib',
+        '<(src)/syzygy/trace/parse/parse.gyp:parse_lib',
         '<(src)/syzygy/trace/agent_logger/agent_logger.gyp:agent_logger',
-        '<(src)/syzygy/trace/common/common.gyp:trace_unittest_utils',
-        '<(src)/syzygy/trace/service/service.gyp:call_trace_service_exe',
         '<(src)/testing/gmock.gyp:gmock',
         '<(src)/third_party/pcre/pcre.gyp:pcre_lib',
         '<(src)/third_party/protobuf/protobuf.gyp:protobuf_lite_lib',
       ],
+      'conditions': [
+        ['target_arch == "ia32"', {
+          'dependencies': [
+            '<@(integration_tests_32bit_dependencies)',
+          ],
+        }],
+      ],
       'msvs_settings': {
         'VCLinkerTool': {
           # This test binary is initially compiled without large address
@@ -218,10 +230,22 @@
         'integration_tests_harness.cc',
       ],
       'dependencies': [
-        'integration_tests_dll',
         '<(src)/base/base.gyp:base',
         '<(src)/syzygy/common/common.gyp:common_lib',
       ],
+      'conditions': [
+        ['target_arch == "ia32"', {
+          'dependencies': [
+            'integration_tests_dll',
+          ],
+        },
+         'target_arch == "x64"', {
+          'dependencies': [
+            'integration_tests_clang_dll',

[Sébastien Marchand, 2017/08/08 15:01:03]

You can't add this until this target compile successfully, otherwise it'll break
the x64 build, also we want to use the Clang DLL both in x86 and in x64:
- For x86 we run the tests on Syzygy + Clang
- For x64 we only use Clang.

[njanevsk, 2017/08/10 17:15:00]

Done.

+          ],
+        },
+        ],
+      ],
       'msvs_settings': {
         'VCLinkerTool': {
           # Asan agent is compiled without large address spaces to allow a
@@ -240,11 +264,23 @@
         'integration_tests_harness.cc',
       ],
       'dependencies': [
-        'integration_tests_dll',
         '<(src)/base/base.gyp:base',
         '<(src)/syzygy/agent/asan/asan.gyp:syzyasan_rtl_lib',
         '<(src)/syzygy/common/common.gyp:common_lib',
       ],
+      'conditions': [
+        ['target_arch == "ia32"', {
+          'dependencies': [
+            'integration_tests_dll',
+          ],
+        },
+         'target_arch == "x64"', {
+          'dependencies': [
+            'integration_tests_clang_dll',
+          ],
+        },
+        ],
+      ],
       'msvs_settings': {
         'VCLinkerTool': {
           # Asan agent is compiled without large address spaces to allow a