Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: util/util_test.gyp

Issue 1336823002: win x86: Grab bag of restructuring to get tests working on x86-on-x86 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: fixes2 Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Crashpad Authors. All rights reserved. 1 # Copyright 2014 The Crashpad Authors. All rights reserved.
2 # 2 #
3 # Licensed under the Apache License, Version 2.0 (the "License"); 3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License. 4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at 5 # You may obtain a copy of the License at
6 # 6 #
7 # http://www.apache.org/licenses/LICENSE-2.0 7 # http://www.apache.org/licenses/LICENSE-2.0
8 # 8 #
9 # Unless required by applicable law or agreed to in writing, software 9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS, 10 # distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 'msvs_configuration_platform': 'x64', 119 'msvs_configuration_platform': 'x64',
120 # Set an unusually high load address to make sure that the main 120 # Set an unusually high load address to make sure that the main
121 # executable still appears as the first element in 121 # executable still appears as the first element in
122 # ProcessInfo::Modules(). 122 # ProcessInfo::Modules().
123 'msvs_settings': { 123 'msvs_settings': {
124 'VCLinkerTool': { 124 'VCLinkerTool': {
125 'AdditionalOptions': [ 125 'AdditionalOptions': [
126 '/BASE:0x78000000', 126 '/BASE:0x78000000',
127 '/FIXED', 127 '/FIXED',
128 ], 128 ],
129 'MinimumRequiredVersion': '5.02', # Server 2003.
129 'TargetMachine': '17', # x64. 130 'TargetMachine': '17', # x64.
130 }, 131 },
131 }, 132 },
132 }, 133 },
133 { 134 {
134 # Same as above, but explicitly x86 to test 64->32 access. 135 # Same as above, but explicitly x86 to test 64->32 access.
135 'target_name': 'crashpad_util_test_process_info_test_child_x86', 136 'target_name': 'crashpad_util_test_process_info_test_child_x86',
136 'type': 'executable', 137 'type': 'executable',
137 'sources': [ 138 'sources': [
138 'win/process_info_test_child.cc', 139 'win/process_info_test_child.cc',
139 ], 140 ],
140 'msvs_configuration_platform': 'x86', 141 'msvs_configuration_platform': 'x86',
141 # Set an unusually high load address to make sure that the main 142 # Set an unusually high load address to make sure that the main
142 # executable still appears as the first element in 143 # executable still appears as the first element in
143 # ProcessInfo::Modules(). 144 # ProcessInfo::Modules().
144 'msvs_settings': { 145 'msvs_settings': {
145 'VCLinkerTool': { 146 'VCLinkerTool': {
146 'AdditionalOptions': [ 147 'AdditionalOptions': [
147 '/BASE:0x78000000', 148 '/BASE:0x78000000',
148 '/FIXED', 149 '/FIXED',
149 ], 150 ],
150 'TargetMachine': '1', # x86. 151 'TargetMachine': '1', # x86.
151 }, 152 },
152 }, 153 },
153 }, 154 },
154 ] 155 ]
155 }], 156 }],
156 ], 157 ],
157 } 158 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698