merged from default

changeset: 2114:221982fae285 tag: tip parent: 2111:a3c761a3743c user: Chris AtLee <catlee@mozilla.com> date: Thu Aug 11 10:56:14 2011 -0400 summary: Bug 561754: don't use stackwalk cgi if we're not downloading symbols. r=bhearsum --HG-- branch : production-0.8
mozilla-releng · Aug 11, 2011 · f13c062 · f13c062
2 parents 9797849 + 6df34d2
commit f13c062
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -6438,7 +6438,7 @@ def __init__(self, platform, test_suites, env, productName='firefox',
         self.chunkByDir = chunkByDir
 
         self.env = MozillaEnvironments['%s-unittest' % platform].copy()
-        if stackwalk_cgi:
+        if stackwalk_cgi and kwargs.get('downloadSymbols'):
             self.env['MINIDUMP_STACKWALK_CGI'] = stackwalk_cgi
         else:
             self.env['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(platform)
@@ -6461,7 +6461,7 @@ def addSetupSteps(self):
 
     def addRunTestSteps(self):
         # Run them!
-        if self.stackwalk_cgi:
+        if self.stackwalk_cgi and self.downloadSymbols:
             symbols_path = '%(symbols_url)s'
         else:
             symbols_path = 'symbols'