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

Side by Side Diff: util/win/process_info_test.cc

Issue 1343433003: win: Don't run x64 specific test unless built for x64 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@fix-wow64test
Patch Set: . 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName))); 154 modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName)));
155 // lz32.dll is an uncommonly-used-but-always-available module that the test 155 // lz32.dll is an uncommonly-used-but-always-available module that the test
156 // binary manually loads. 156 // binary manually loads.
157 const wchar_t kLz32dllName[] = L"\\lz32.dll"; 157 const wchar_t kLz32dllName[] = L"\\lz32.dll";
158 ASSERT_GE(modules.back().name.size(), wcslen(kLz32dllName)); 158 ASSERT_GE(modules.back().name.size(), wcslen(kLz32dllName));
159 EXPECT_EQ(kLz32dllName, 159 EXPECT_EQ(kLz32dllName,
160 modules.back().name.substr(modules.back().name.size() - 160 modules.back().name.substr(modules.back().name.size() -
161 wcslen(kLz32dllName))); 161 wcslen(kLz32dllName)));
162 } 162 }
163 163
164 // This test can't run the child if the host OS is x86, and can't read from the
165 // child if it is x86 and the child is x64, so it only makes sense to run this
Mark Mentovai 2015/09/11 22:40:58 “can’t read from the child if it is x86 and the ch
scottmg 2015/09/11 22:45:51 A bit of both. There's undocumented equivalents to
Mark Mentovai 2015/09/11 22:51:17 Maybe not useful, but interesting, and if it’s jus
166 // if we built as x64.
167 #if defined(ARCH_CPU_64_BITS)
164 TEST(ProcessInfo, OtherProcessX64) { 168 TEST(ProcessInfo, OtherProcessX64) {
165 TestOtherProcess(L"x64"); 169 TestOtherProcess(L"x64");
166 } 170 }
171 #endif // ARCH_CPU_64_BITS
167 172
168 TEST(ProcessInfo, OtherProcessX86) { 173 TEST(ProcessInfo, OtherProcessX86) {
169 TestOtherProcess(L"x86"); 174 TestOtherProcess(L"x86");
170 } 175 }
171 176
172 } // namespace 177 } // namespace
173 } // namespace test 178 } // namespace test
174 } // namespace crashpad 179 } // namespace crashpad
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698