Bug 1085762 Use absolute directories for mozmill to fix bustage on Mac. r=jcranmer,a=Standard8
authorMark Banner <standard8@mozilla.com>
Thu, 23 Oct 2014 09:01:13 +0100
changeset 20875 97aaf40ebfdb379644ed61fee8ab6ddf0121c3de
parent 20872 7e5f0a461d01cc581a3336e66ebf08f39487d92b
child 20876 7a1c94333d8dcb88991fb09dd6ed5b4f66124913
push id1245
push usermbanner@mozilla.com
push dateThu, 23 Oct 2014 09:50:23 +0000
treeherdercomm-beta@97aaf40ebfdb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, Standard8
bugs1085762
Bug 1085762 Use absolute directories for mozmill to fix bustage on Mac. r=jcranmer,a=Standard8
mail/test/mozmill/runtestlist.py
mail/testsuite-targets.mk
--- a/mail/test/mozmill/runtestlist.py
+++ b/mail/test/mozmill/runtestlist.py
@@ -69,17 +69,17 @@ f = open(options.list, 'rt')
 for directory in f:
     log.info("INFO | (runtestlist.py) | Running directory: %s",
              directory.rstrip())
     if options.dir != "":
         testDirectory = os.path.join(options.dir, directory.rstrip())
     else:
         testDirectory = directory.rstrip()
     args = [sys.executable, "runtest.py", "-t", testDirectory,
-            "--binary", options.binary, "--symbols-path", options.symbols]
+            "--binary", os.path.abspath(options.binary), "--symbols-path", options.symbols]
 
     if options.plugins:
         args.append("--plugins-path")
         args.append(options.plugins)
 
     print args
     outputPipe = subprocess.PIPE
 
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -11,42 +11,42 @@ endif
 MOZMILLPYTHON = $(abspath $(VIRTUALENV_BIN)/python$(BIN_SUFFIX))
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Mac options
 APP_NAME = $(MOZ_APP_DISPLAYNAME)
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
-BINARY = ../../$(DIST)/$(APP_NAME).app/
+BINARY = $(DIST)/$(APP_NAME).app/
 else
 # Non-mac options
-BINARY = ../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
+BINARY = $(DIST)/bin/thunderbird$(BIN_SUFFIX)
 endif
 
 check-no-solo = $(foreach solo,SOLO_TEST SOLO_FILE,$(if $($(solo)),$(error $(subst SOLOVAR,$(solo),$(1)))))
 find-solo-test = $(if $(and $(SOLO_TEST),$(SOLO_FILE)),$(error Both SOLO_TEST and SOLO_FILE are specified. You may only specify one.),$(if $(SOLO_TEST),$(SOLO_TEST),$(if $(SOLO_FILE),$(SOLO_FILE),$(error SOLO_TEST or SOLO_FILE needs to be specified.))))
 
 # PYTHONHOME messes very badly with virtualenv setups, so unset it.
 mozmill:
 	$(call check-no-solo,SOLOVAR is specified. Perhaps you meant mozmill-one.)
 	unset PYTHONHOME && cd $(MOZMILLDIR) && MACOSX_DEPLOYMENT_TARGET= \
 	$(MOZMILLPYTHON) runtestlist.py --list=mozmilltests.list \
-	--binary=$(BINARY) \
+	--binary=$(abspath $(BINARY)) \
 	--dir=$(abspath $(topsrcdir))/../mail/test/mozmill \
 	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
 	--plugins-path=$(abspath $(DIST)/plugins) \
 	$(MOZMILL_EXTRA)
 
 mozmill-one: solo-test = $(find-solo-test)
 mozmill-one:
 	unset PYTHONHOME && cd $(MOZMILLDIR) && MACOSX_DEPLOYMENT_TARGET= \
 	$(MOZMILLPYTHON) runtest.py \
 	--test=$(abspath $(topsrcdir))/../mail/test/mozmill/$(solo-test) \
-	--binary=$(BINARY) \
+	--binary=$(abspath $(BINARY)) \
 	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
 	--plugins-path=$(abspath $(DIST)/plugins) \
 	$(MOZMILL_EXTRA)
 
 # We need to add the mozmill tests to the package for tests.
 ifndef UNIVERSAL_BINARY
 # If Lightning is enabled, also stage the lightning extension
 ifdef MOZ_CALENDAR