mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 485436 - work around OS X 10.4 xpcshell bustage with smarter default setting in runtests.py. r=waldo
This commit is contained in:
parent
b2f8e75361
commit
283013022e
@ -347,6 +347,18 @@ def main():
|
||||
parser = MochitestOptions()
|
||||
options, args = parser.parse_args()
|
||||
|
||||
if options.xrePath is None:
|
||||
# default xrePath to the app path if not provided
|
||||
# but only if an app path was explicitly provided
|
||||
if options.app != parser.defaults['app']:
|
||||
options.xrePath = os.path.dirname(options.app)
|
||||
else:
|
||||
# otherwise default to dist/bin
|
||||
options.xrePath = automation.DIST_BIN
|
||||
|
||||
# allow relative paths
|
||||
options.xrePath = getFullPath(options.xrePath)
|
||||
|
||||
options.app = getFullPath(options.app)
|
||||
if not os.path.exists(options.app):
|
||||
msg = """\
|
||||
@ -355,13 +367,6 @@ Are you executing $objdir/_tests/testing/mochitest/runtests.py?"""
|
||||
print msg % {"app": options.app}
|
||||
sys.exit(1)
|
||||
|
||||
# default xrePath to the app path if not provided
|
||||
if options.xrePath is None:
|
||||
options.xrePath = os.path.dirname(options.app)
|
||||
else:
|
||||
# allow relative paths
|
||||
options.xrePath = getFullPath(options.xrePath)
|
||||
|
||||
options.utilityPath = getFullPath(options.utilityPath)
|
||||
options.certPath = getFullPath(options.certPath)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user