From 706346365d935a9b1ff521e91b82827459789f4c Mon Sep 17 00:00:00 2001 From: Sam Garrett Date: Wed, 7 Mar 2012 09:27:45 -0800 Subject: [PATCH] Bug 637103 - Adding a reminder so that the runner knows only one screenshot was taken. r=karlt --- build/automation.py.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build/automation.py.in b/build/automation.py.in index ca9c8ce4c33..802e7f868c0 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -737,8 +737,11 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t def killAndGetStack(self, proc, utilityPath, debuggerInfo): """Kill the process, preferrably in a way that gets us a stack trace.""" - if not debuggerInfo and not self.haveDumpedScreen: - self.dumpScreen(utilityPath) + if not debuggerInfo: + if self.haveDumpedScreen: + self.log.info("Not taking screenshot here: see the one that was previously logged") + else: + self.dumpScreen(utilityPath) if self.CRASHREPORTER and not debuggerInfo: if self.UNIXISH: @@ -795,8 +798,11 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t if stackFixerFunction: line = stackFixerFunction(line) self.log.info(line.rstrip().decode("UTF-8", "ignore")) - if not debuggerInfo and not self.haveDumpedScreen and "TEST-UNEXPECTED-FAIL" in line and "Test timed out" in line: - self.dumpScreen(utilityPath) + if not debuggerInfo and "TEST-UNEXPECTED-FAIL" in line and "Test timed out" in line: + if self.haveDumpedScreen: + self.log.info("Not taking screenshot here: see the one that was previously logged") + else: + self.dumpScreen(utilityPath) (line, didTimeout) = self.readWithTimeout(logsource, timeout) if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):