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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: snapshot/win/end_to_end_test.py

Issue 1405243002: Fix CRITICAL_SECTION test (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« client/crashpad_client_win.cc ('K') | « handler/win/crashy_test_program.cc ('k') | util/util.gyp » ('j') | util/win/critical_section_with_debug_info.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: snapshot/win/end_to_end_test.py
diff --git a/snapshot/win/end_to_end_test.py b/snapshot/win/end_to_end_test.py
index 75dafde9730d3c6ea49476756636ab9bff1b24b3..1a66045925a1b629b64749fd3efa553163de0774 100644
--- a/snapshot/win/end_to_end_test.py
+++ b/snapshot/win/end_to_end_test.py
@@ -15,6 +15,7 @@
# limitations under the License.
import os
+import platform
import random
import re
import subprocess
@@ -182,7 +183,9 @@ def RunTests(cdb_path, dump_path, pipe_name):
out = CdbRun(cdb_path, dump_path, '!locks')
out.Check(r'CritSec crashy_program!crashpad::`anonymous namespace\'::'
r'g_test_critical_section', 'lock was captured')
- out.Check(r'\*\*\* Locked', 'lock debug info was captured, and is locked')
+ if float(platform.win32_ver()[0]) != 7:
+ # We can't allocate CSs with .DebugInfo on Win 7.
Mark Mentovai 2015/10/16 19:42:47 Spell out critical section.
scottmg 2015/10/16 20:04:11 Done.
+ out.Check(r'\*\*\* Locked', 'lock debug info was captured, and is locked')
def main(args):
« client/crashpad_client_win.cc ('K') | « handler/win/crashy_test_program.cc ('k') | util/util.gyp » ('j') | util/win/critical_section_with_debug_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698