Index: util/util.gyp |
diff --git a/util/util.gyp b/util/util.gyp |
index ba72b15c4454d30f67b335ff5db433e63b3c8e5e..28d695d7520ea5cf4a650403a974264e18e46ea5 100644 |
--- a/util/util.gyp |
+++ b/util/util.gyp |
@@ -131,6 +131,7 @@ |
'synchronization/semaphore.h', |
'win/process_info.cc', |
'win/process_info.h', |
+ 'win/process_structs.h', |
'win/scoped_handle.cc', |
'win/scoped_handle.h', |
'win/time.cc', |
@@ -342,7 +343,7 @@ |
['OS=="win"', { |
'targets': [ |
{ |
- 'target_name': 'util_test_process_info_test_child', |
+ 'target_name': 'util_test_process_info_test_child_x64', |
Mark Mentovai
2015/03/09 22:44:44
Do you want to add a TargetMachine: 17 definition
scottmg
2015/03/09 23:23:57
Good point, done. Needed an msvs_configuration_pla
|
'type': 'executable', |
'sources': [ |
'win/process_info_test_child.cc', |
@@ -359,6 +360,27 @@ |
}, |
}, |
}, |
+ { |
+ # Same as above, but explicitly x86 to test 64->32 access. |
+ 'target_name': 'util_test_process_info_test_child_x86', |
+ 'type': 'executable', |
+ 'sources': [ |
+ 'win/process_info_test_child.cc', |
+ ], |
+ 'msvs_configuration_platform': 'x86', |
+ # Set an unusually high load address to make sure that the main |
+ # executable still appears as the first element in |
+ # ProcessInfo::Modules(). |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'AdditionalOptions': [ |
+ '/BASE:0x78000000', |
+ '/FIXED', |
+ ], |
+ 'TargetMachine': '1', # x86. |
+ }, |
+ }, |
+ }, |
] |
}], |
], |