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 748490 - Part 3: Followups to part 2; r=ted

Browse Source 
Previous patch was submitted prematurely by accident. This addresses
nits from review.
This commit is contained in:
Gregory Szorc 2012-05-10 10:19:16 -07:00
parent 2f23696854
commit f10aa4ab08
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/rules.mk
View File

@ -117,7 +117,7 @@ xpcshell-tests:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--tests-root-dir=$(testxpcobjdir) \ --tests-root-dir=$(testxpcobjdir) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--xunit-file=$(testxpcobjdir)/$(relativesrcdir)/results.xml \ --xunit-file=$(testxpcobjdir)/$(relativesrcdir)/results.xml \
--xunit-suite-name=xpcshell \ --xunit-suite-name=xpcshell \
$(EXTRA_TEST_ARGS) \ $(EXTRA_TEST_ARGS) \
@ -148,7 +148,7 @@ check-interactive:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--test-path=$(SOLO_FILE) \ --test-path=$(SOLO_FILE) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--profile-name=$(MOZ_APP_NAME) \ --profile-name=$(MOZ_APP_NAME) \
--interactive \ --interactive \
$(LIBXUL_DIST)/bin/xpcshell \ $(LIBXUL_DIST)/bin/xpcshell \
@ -162,7 +162,7 @@ check-one:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--test-path=$(SOLO_FILE) \ --test-path=$(SOLO_FILE) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--profile-name=$(MOZ_APP_NAME) \ --profile-name=$(MOZ_APP_NAME) \
--verbose \ --verbose \
$(EXTRA_TEST_ARGS) \ $(EXTRA_TEST_ARGS) \

6
js/src/config/rules.mk
View File

@ -117,7 +117,7 @@ xpcshell-tests:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--tests-root-dir=$(testxpcobjdir) \ --tests-root-dir=$(testxpcobjdir) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--xunit-file=$(testxpcobjdir)/$(relativesrcdir)/results.xml \ --xunit-file=$(testxpcobjdir)/$(relativesrcdir)/results.xml \
--xunit-suite-name=xpcshell \ --xunit-suite-name=xpcshell \
$(EXTRA_TEST_ARGS) \ $(EXTRA_TEST_ARGS) \
@ -148,7 +148,7 @@ check-interactive:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--test-path=$(SOLO_FILE) \ --test-path=$(SOLO_FILE) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--profile-name=$(MOZ_APP_NAME) \ --profile-name=$(MOZ_APP_NAME) \
--interactive \ --interactive \
$(LIBXUL_DIST)/bin/xpcshell \ $(LIBXUL_DIST)/bin/xpcshell \
@ -162,7 +162,7 @@ check-one:
--symbols-path=$(DIST)/crashreporter-symbols \ --symbols-path=$(DIST)/crashreporter-symbols \
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--test-path=$(SOLO_FILE) \ --test-path=$(SOLO_FILE) \
--tests-modules-dir=$(DEPTH)/_tests/modules \ --testing-modules-dir=$(DEPTH)/_tests/modules \
--profile-name=$(MOZ_APP_NAME) \ --profile-name=$(MOZ_APP_NAME) \
--verbose \ --verbose \
$(EXTRA_TEST_ARGS) \ $(EXTRA_TEST_ARGS) \

2
testing/testsuite-targets.mk
View File

@ -245,7 +245,7 @@ xpcshell-tests:
--build-info-json=$(DEPTH)/mozinfo.json \ --build-info-json=$(DEPTH)/mozinfo.json \
--no-logfiles \ --no-logfiles \
--tests-root-dir=$(call core_abspath,_tests/xpcshell) \ --tests-root-dir=$(call core_abspath,_tests/xpcshell) \
--tests-modules-dir=$(call core_abspath,_tests/modules) \ --testing-modules-dir=$(call core_abspath,_tests/modules) \
--xunit-file=$(call core_abspath,_tests/xpcshell/results.xml) \ --xunit-file=$(call core_abspath,_tests/xpcshell/results.xml) \
--xunit-suite-name=xpcshell \ --xunit-suite-name=xpcshell \
$(SYMBOLS_PATH) \ $(SYMBOLS_PATH) \

4
testing/xpcshell/head.js
View File

@ -303,7 +303,7 @@ function do_get_idle() {
function _execute_test() { function _execute_test() {
// Map resource://test/ to current working directory and // Map resource://test/ to current working directory and
// resource://testing/ to the shared test modules directory. // resource://testing-common/ to the shared test modules directory.
let (ios = Components.classes["@mozilla.org/network/io-service;1"] let (ios = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService)) { .getService(Components.interfaces.nsIIOService)) {
let protocolHandler = let protocolHandler =
@ -318,7 +318,7 @@ function _execute_test() {
modulesFile.initWithPath(_TESTING_MODULES_DIR); modulesFile.initWithPath(_TESTING_MODULES_DIR);
let modulesURI = ios.newFileURI(modulesFile); let modulesURI = ios.newFileURI(modulesFile);
protocolHandler.setSubstitution("testing", modulesURI); protocolHandler.setSubstitution("testing-common", modulesURI);
} }
} }

6
testing/xpcshell/runxpcshelltests.py
View File

@ -235,7 +235,7 @@ class XPCShellTests(object):
'-e', 'const _HEAD_JS_PATH = "%s";' % self.headJSPath '-e', 'const _HEAD_JS_PATH = "%s";' % self.headJSPath
] ]
if self.testingModulesDir is not None: if self.testingModulesDir:
self.xpcsCmd.extend([ self.xpcsCmd.extend([
'-e', '-e',
'const _TESTING_MODULES_DIR = "%s";' % self.testingModulesDir 'const _TESTING_MODULES_DIR = "%s";' % self.testingModulesDir
@ -621,7 +621,7 @@ class XPCShellTests(object):
raise Exception("testsRootDir path does not exists: %s" % raise Exception("testsRootDir path does not exists: %s" %
testsRootDir) testsRootDir)
if testingModulesDir is not None: if testingModulesDir:
if not os.path.isabs(testingModulesDir): if not os.path.isabs(testingModulesDir):
testingModulesDir = os.path.abspath(testingModulesDir) testingModulesDir = os.path.abspath(testingModulesDir)
@ -900,7 +900,7 @@ class XPCShellOptions(OptionParser):
self.add_option("--tests-root-dir", self.add_option("--tests-root-dir",
type="string", dest="testsRootDir", default=None, type="string", dest="testsRootDir", default=None,
help="absolute path to directory where all tests are located. this is typically $(objdir)/_tests") help="absolute path to directory where all tests are located. this is typically $(objdir)/_tests")
self.add_option("--tests-modules-dir", self.add_option("--testing-modules-dir",
dest="testingModulesDir", default=None, dest="testingModulesDir", default=None,
help="Directory where testing modules are located.") help="Directory where testing modules are located.")
self.add_option("--total-chunks", self.add_option("--total-chunks",