wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1162479 - Fix mochitest make target regression with duplicate extraProfilePath, r=chmanchester

Browse Source
This commit is contained in:
Andrew Halberstadt 2015-05-07 14:38:43 -04:00
parent 9c3cca509f
commit 46ca42739c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/mochitest/mochitest_options.py
View File

@ -656,7 +656,9 @@ class MochitestArguments(ArgumentContainer):
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.

2
testing/testsuite-targets.mk
View File

@ -41,7 +41,6 @@ RUN_MOCHITEST = \
--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 = \
@ -50,7 +49,6 @@ RERUN_MOCHITEST = \
--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 = \