Bug 695513 - Remote reftests should fail more cleanly if an invalid test manifest is passed in. r=mw22

This commit is contained in:
Joel Maher 2011-10-19 07:23:54 -04:00
parent 8be81d3052
commit a5a587da68

View File

@ -428,6 +428,9 @@ def main():
automation.setRemoteLog(options.remoteLogFile)
reftest = RemoteReftest(automation, dm, options, SCRIPT_DIRECTORY)
# Hack in a symbolic link for jsreftest
os.system("ln -s ../jsreftest " + str(os.path.join(SCRIPT_DIRECTORY, "jsreftest")))
# Dynamically build the reftest URL if possible, beware that args[0] should exist 'inside' the webroot
manifest = args[0]
if os.path.exists(os.path.join(SCRIPT_DIRECTORY, args[0])):
@ -439,9 +442,6 @@ def main():
print "ERROR: Could not find test manifest '%s'" % manifest
sys.exit(1)
# Hack in a symbolic link for jsreftest
os.system("ln -s ../jsreftest " + str(os.path.join(SCRIPT_DIRECTORY, "jsreftest")))
# Start the webserver
reftest.startWebServer(options)