bug 421611 - Need to be able to run tests on arbitrary build - add --xre-path argument to runreftest.py. r=bsmedberg

This commit is contained in:
Ted Mielczarek 2009-03-21 11:21:07 -04:00
Родитель a2f28bc235
Коммит a36827d4d2
1 изменённых файлов: 12 добавлений и 3 удалений

Просмотреть файл

@ -80,6 +80,10 @@ def main():
action = "store", type = "string", dest = "app",
default = os.path.join(SCRIPT_DIRECTORY, automation.DEFAULT_APP),
help = "absolute path to application, overriding default")
parser.add_option("--xre-path",
action = "store", type = "string", dest = "xrePath",
default = None, # default is set below
help = "absolute path to directory containing XRE (probably xulrunner)")
parser.add_option("--extra-profile-file",
action = "append", dest = "extraProfileFiles",
default = [],
@ -101,6 +105,12 @@ Are you executing $objdir/_tests/reftest/runreftest.py?""" \
% {"app": options.app}
sys.exit(1)
if options.xrePath is None:
options.xrePath = os.path.dirname(options.app)
else:
# allow relative paths
options.xrePath = getFullPath(options.xrePath)
profileDir = None
try:
profileDir = mkdtemp()
@ -114,10 +124,9 @@ Are you executing $objdir/_tests/reftest/runreftest.py?""" \
# via the commandline at your own risk.
browserEnv["NO_EM_RESTART"] = "1"
browserEnv["XPCOM_DEBUG_BREAK"] = "warn"
appDir = os.path.dirname(options.app)
if automation.UNIXISH:
browserEnv["LD_LIBRARY_PATH"] = appDir
browserEnv["MOZILLA_FIVE_HOME"] = appDir
browserEnv["LD_LIBRARY_PATH"] = options.xrePath
browserEnv["MOZILLA_FIVE_HOME"] = options.xrePath
browserEnv["GNOME_DISABLE_CRASH_DIALOG"] = "1"
# Retrieve the logger where to report the leaks to.