bug 695274 - UNIXISH, IS_MAC and IS_WIN32 are class variables not globals r=khuey
authorJohn Ford <jhford@mozilla.com>
Tue, 01 Nov 2011 13:12:50 -0700
changeset 80896 6f455fb4ad716f0a4a0f828d51ba1910f891c28b
parent 80895 86b1bbf9421638f4ded347692cfa1d065fddc6d5
child 80897 7cb178191144b0bd94260105fffc7efb3030465e
push id434
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 12:10:54 +0000
treeherdermozilla-beta@bddb6ed8dd47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs695274
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 695274 - UNIXISH, IS_MAC and IS_WIN32 are class variables not globals r=khuey
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -738,23 +738,23 @@ user_pref("camino.use_system_proxy_setti
 
     def killPid(self, pid):
       os.kill(pid, signal.SIGKILL)
 
     def dumpScreen(self, utilityPath):
       self.haveDumpedScreen = True;
 
       # Need to figure out what tool and whether it write to a file or stdout
-      if UNIXISH:
+      if self.UNIXISH:
         utility = [os.path.join(utilityPath, "screentopng")]
         imgoutput = 'stdout'
-      elif IS_MAC:
+      elif self.IS_MAC:
         utility = ['/usr/sbin/screencapture', '-C', '-x', '-t', 'png']
         imgoutput = 'file'
-      elif IS_WIN32:
+      elif self.IS_WIN32:
         self.log.info("If you fixed bug 589668, you'd get a screenshot here")
         return
 
       # Run the capture correctly for the type of capture
       try:
         if imgoutput == 'file':
           tmpfd, imgfilename = tempfile.mkstemp(prefix='mozilla-test-fail_')
           os.close(tmpfd)