Fix mailbloat bustage from bug 525047 landing in mozilla-central. r=bustage fix
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 13 Jan 2010 23:17:58 +0000
changeset 4696 6f150db7f8e59ad369906c01d56a5a69fa42eaa7
parent 4695 2236baab44567cbd88a40483c10090025798ac5c
child 4697 fbdd6b0f69536349050fe5c07678b8a4fd8b9719
push idunknown
push userunknown
push dateunknown
reviewersbustage
bugs525047
Fix mailbloat bustage from bug 525047 landing in mozilla-central. r=bustage fix
mailnews/testsuite-targets.mk
--- a/mailnews/testsuite-targets.mk
+++ b/mailnews/testsuite-targets.mk
@@ -43,13 +43,21 @@ endif
 
 SYMBOLS_PATH := --symbols-path=$(DIST)/crashreporter-symbols
 
 ifdef MOZ_SUITE
 EXTRA_BLOAT_ARGS := -mail
 endif
 
 mailbloat:
+ifdef MOZILLA_1_9_2_BRANCH
 	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
         -I$(DIST)/../build \
         $(topsrcdir)/mailnews/test/performance/bloat/runtest.py \
 	--distdir=$(DIST) --bin=$(MOZ_APP_NAME) --brand=$(APP_NAME) \
 	$(SYMBOLS_PATH) $(EXTRA_BLOAT_ARGS)
+else
+	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
+        -I$(DIST)/../build -I$(MOZILLA_DIR)/build \
+        $(topsrcdir)/mailnews/test/performance/bloat/runtest.py \
+	--distdir=$(DIST) --bin=$(MOZ_APP_NAME) --brand=$(APP_NAME) \
+	$(SYMBOLS_PATH) $(EXTRA_BLOAT_ARGS)
+endif