merged from default

changeset: 2802:b25a4046025b parent: 2800:86dd2d12fa51 user: Mark Banner <bugzilla@standard8.plus.com> date: Mon Jun 11 16:00:33 2012 +0100 summary: Bug 763422 - Thunderbird Earlybird builds broken due to length of directories (add comm to the reallyShort replacement list). r=jhopkins changeset: 2806:b20f1a16297b parent: 2802:b25a4046025b user: Chris Cooper <ccooper@deadsquid.com> date: Wed Jun 13 17:12:43 2012 -0400 summary: Bug 571443 - Use fix_stack_using_bpsyms.py script instead of fix-%s-stack.pl - r=catlee changeset: 2807:5815f37c9124 tag: tip user: Aki Sasaki <asasaki@mozilla.com> date: Wed Jun 13 14:48:31 2012 -0700 summary: bug 724221 - fix ScriptFactory SetProperty step for windows. r=jhopkins --HG-- branch : production-0.8
mozilla-releng · Jun 14, 2012 · 6b90f7b · 6b90f7b
2 parents 6532a00 + 439ee2b
commit 6b90f7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common.py b/common.py
@@ -38,6 +38,7 @@ def reallyShort(name, product=None):
 
     mappings = {
         'mozilla': 'm',
+        'comm': 'c',
         'central': 'cen',
         '1.9.1': '191',
         '1.9.2': '192',

diff --git a/process/factory.py b/process/factory.py
@@ -1448,10 +1448,9 @@ def addLeakTestStepsCommon(self, baseUrl, leakEnv, graphAndUpload):
                   workdir='.',
                   command=['/bin/bash', '-c',
                            'perl '
-                           'build%s/tools/rb/fix-%s-stack.pl '
+                           'build%s/tools/rb/fix_stack_using_bpsyms.py '
                            'sdleak.tree.raw '
-                           '> sdleak.tree' % (self.mozillaDir,
-                                              self.platform.replace("64", "")),
+                           '> sdleak.tree' % self.mozillaDir,
                            ],
                   warnOnFailure=True,
                   haltOnFailure=True
@@ -8493,8 +8492,8 @@ def runScript(self):
         cmd = ['bash', '-c', 'for file in `ls -1`; do cat $file; done']
         if self.platform and 'win' in self.platform:
             # note: prefixing 'type' command with '@' to suppress extraneous output
-            self.get_basedir_cmd = ['cmd', '/C', 'for', '%f', 'in', '(*)', 'do', '@type', '%f']
-        
+            cmd = ['cmd', '/C', 'for', '%f', 'in', '(*)', 'do', '@type', '%f']
+
         self.addStep(SetProperty(
             name='set_script_properties',
             command=cmd,