bug 523330 - default symbols path busted for mochitest/reftest. r=bsmedberg

build/automation-build.mk

@@ -21,7 +21,6 @@ endif
 endif
 
 _PROFILE_DIR = $(TARGET_DEPTH)/_profile/pgo
-_SYMBOLS_PATH = $(TARGET_DIST)/crashreporter-symbols
 
 ABSOLUTE_TOPSRCDIR = $(call core_abspath,$(MOZILLA_DIR))
 _CERTS_SRC_DIR = $(ABSOLUTE_TOPSRCDIR)/build/pgo/certs
@@ -32,7 +31,6 @@ AUTOMATION_PPARGS = 	\
 			-DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \
 			-DPROFILE_DIR=\"$(_PROFILE_DIR)\" \
 			-DCERTS_SRC_DIR=\"$(_CERTS_SRC_DIR)\" \
-			-DSYMBOLS_PATH=\"$(_SYMBOLS_PATH)\" \
 			-DPERL="\"$(PERL)\"" \
 			$(NULL)
 

build/automation.py.in

@@ -72,7 +72,6 @@ __all__ = [
            "environment",
            "IS_TEST_BUILD",
            "IS_DEBUG_BUILD",
-           "SYMBOLS_PATH",
           ]
 
 # These are generated in mozilla/build/Makefile.in
@@ -95,7 +94,6 @@ UNIXISH = not IS_WIN32 and not IS_MAC
 #expand CERTS_SRC_DIR = __CERTS_SRC_DIR__
 #expand IS_TEST_BUILD = __IS_TEST_BUILD__
 #expand IS_DEBUG_BUILD = __IS_DEBUG_BUILD__
-#expand SYMBOLS_PATH = __SYMBOLS_PATH__
 
 ###########
 # LOGGING #
@@ -444,7 +442,7 @@ def environment(env = None, xrePath = DIST_BIN, crashreporter = True):
 def runApp(testURL, env, app, profileDir, extraArgs,
            runSSLTunnel = False, utilityPath = DIST_BIN,
            xrePath = DIST_BIN, certPath = CERTS_SRC_DIR,
-           debuggerInfo = None, symbolsPath = SYMBOLS_PATH):
+           debuggerInfo = None, symbolsPath = None):
   "Run the app, log the duration it took to execute, return the status code."
 
   # copy env so we don't munge the caller's environment

layout/tools/reftest/runreftest.py

@@ -124,7 +124,8 @@ Are you executing $objdir/_tests/reftest/runreftest.py?""" \
     # allow relative paths
     options.xrePath = getFullPath(options.xrePath)
 
-  options.symbolsPath = getFullPath(options.symbolsPath)
+  if options.symbolsPath:
+    options.symbolsPath = getFullPath(options.symbolsPath)
   options.utilityPath = getFullPath(options.utilityPath)
 
   debuggerInfo = getDebuggerInfo(oldcwd, options.debugger, options.debuggerArgs,

testing/mochitest/runtests.py.in

@@ -347,7 +347,8 @@ Are you executing $objdir/_tests/testing/mochitest/runtests.py?"""
 
   options.utilityPath = getFullPath(options.utilityPath)
   options.certPath = getFullPath(options.certPath)
-  options.symbolsPath = getFullPath(options.symbolsPath)
+  if options.symbolsPath:
+    options.symbolsPath = getFullPath(options.symbolsPath)
 
   debuggerInfo = getDebuggerInfo(oldcwd, options.debugger, options.debuggerArgs,
     options.debuggerInteractive);

testing/testsuite-targets.mk

@@ -45,6 +45,7 @@ else
 TEST_PATH_ARG :=
 endif
 
+SYMBOLS_PATH := --symbols-path=$(DIST)/crashreporter-symbols
 
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] mochitest*|.
 mochitest:: mochitest-plain mochitest-chrome mochitest-a11y
@@ -53,7 +54,7 @@ RUN_MOCHITEST = \
 	rm -f ./$@.log && \
 	$(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done \
 	  --console-level=INFO --log-file=./$@.log --file-level=INFO \
-	  $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
+	  $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 ifndef NO_FAIL_ON_TEST_ERRORS
 define CHECK_TEST_ERROR
@@ -82,7 +83,8 @@ mochitest-a11y:
 
 
 # Usage: |make [EXTRA_TEST_ARGS=...] *test|.
-RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
+RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py \
+  $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
 
 reftest:
 	$(call RUN_REFTEST,$(topsrcdir)/layout/reftests/reftest.list)
@@ -106,7 +108,7 @@ xpcshell-tests:
 	  $(topsrcdir)/testing/xpcshell/runxpcshelltests.py \
 	  --manifest=$(DEPTH)/_tests/xpcshell/all-test-dirs.list \
 	  --no-logfiles \
-	  --symbols-path=$(DIST)/crashreporter-symbols \
+          $(SYMBOLS_PATH) \
 	  $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) \
 	  $(DIST)/bin/xpcshell