Bug 1162479 - Fix mochitest make target regression with duplicate extraProfilePath, r=chmanchester
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 07 May 2015 14:38:43 -0400
changeset 242879 de7d54b1e8485d64a487d9271482bd27fe31fdd7
parent 242878 3f62597c7e66716ff5e8a37057e29b58a063fd06
child 242880 0313bc7f60521d9807cf9d5fbdcd843d9d5b8dd4
push id28713
push userkwierso@gmail.com
push dateFri, 08 May 2015 17:06:43 +0000
treeherdermozilla-central@fd5e9b7eec13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1162479
milestone40.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 1162479 - Fix mochitest make target regression with duplicate extraProfilePath, r=chmanchester
testing/mochitest/mochitest_options.py
testing/testsuite-targets.mk
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -651,17 +651,19 @@ class MochitestArguments(ArgumentContain
                 # should always set the flag that populates this variable. If buildbot ever
                 # passes this argument, this code can be deleted.
                 possible = os.path.join(here, os.path.pardir, 'modules')
 
                 if os.path.isdir(possible):
                     options.testingModulesDir = possible
 
         if build_obj:
-            options.extraProfileFiles.append(os.path.join(build_obj.distdir, 'plugins'))
+            plugins_dir = os.path.join(build_obj.distdir, 'plugins')
+            if plugins_dir not in options.extraProfileFiles:
+                options.extraProfileFiles.append(plugins_dir)
 
         # Even if buildbot is updated, we still want this, as the path we pass in
         # to the app must be absolute and have proper slashes.
         if options.testingModulesDir is not None:
             options.testingModulesDir = os.path.normpath(
                 options.testingModulesDir)
 
             if not os.path.isabs(options.testingModulesDir):
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -36,26 +36,24 @@ RUN_MOCHITEST_B2G_DESKTOP = \
     $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 RUN_MOCHITEST = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtests.py \
     --log-tbpl=./$@.log \
     --failure-file=$(abspath _tests/testing/mochitest/makefailures.json) \
     --testing-modules-dir=$(abspath _tests/modules) \
-    --extra-profile-file=$(DIST)/plugins \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 RERUN_MOCHITEST = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtests.py \
     --log-tbpl=./$@.log \
     --run-only-tests=makefailures.json \
     --testing-modules-dir=$(abspath _tests/modules) \
-    --extra-profile-file=$(DIST)/plugins \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 RUN_MOCHITEST_REMOTE = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtestsremote.py \
     --log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
     --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
     --testing-modules-dir=$(abspath _tests/modules) \