launcher: Warn if MAIN_DIR isn't present
And move blacklist file listing to further down
This commit is contained in:
parent
e62a2ce4c4
commit
c39a44441e
@ -132,16 +132,12 @@ def main():
|
|||||||
tests_launcher = _TestsLauncher()
|
tests_launcher = _TestsLauncher()
|
||||||
tests_launcher.add_options(parser)
|
tests_launcher.add_options(parser)
|
||||||
|
|
||||||
blacklisted = tests_launcher.get_blacklisted()
|
|
||||||
if blacklisted:
|
|
||||||
msg = "Currently 'hardcoded' blacklisted tests:\n"
|
|
||||||
for name, bug in blacklisted:
|
|
||||||
sys.argv.extend(["-b", name])
|
|
||||||
msg += " + %s -- bug: %s\n" % (name, bug)
|
|
||||||
|
|
||||||
printc(msg, Colors.FAIL, True)
|
|
||||||
|
|
||||||
(options, args) = parser.parse_args()
|
(options, args) = parser.parse_args()
|
||||||
|
|
||||||
|
if not options.sync and not os.path.exists(options.main_dir):
|
||||||
|
printc("MAIN_DIR (%s) does not exists. Forgot to run --sync ?" % os.path.abspath(options.main_dir), Colors.FAIL, True)
|
||||||
|
return -1
|
||||||
|
|
||||||
if options.logsdir is None:
|
if options.logsdir is None:
|
||||||
options.logsdir = os.path.join(options.outputdir, "logs")
|
options.logsdir = os.path.join(options.outputdir, "logs")
|
||||||
if options.xunit_file is None:
|
if options.xunit_file is None:
|
||||||
@ -163,6 +159,15 @@ def main():
|
|||||||
|
|
||||||
tests_launcher.set_settings(options, args)
|
tests_launcher.set_settings(options, args)
|
||||||
|
|
||||||
|
blacklisted = tests_launcher.get_blacklisted()
|
||||||
|
if blacklisted:
|
||||||
|
msg = "Currently 'hardcoded' blacklisted tests:\n"
|
||||||
|
for name, bug in blacklisted:
|
||||||
|
sys.argv.extend(["-b", name])
|
||||||
|
msg += " + %s -- bug: %s\n" % (name, bug)
|
||||||
|
|
||||||
|
printc(msg, Colors.FAIL, True)
|
||||||
|
|
||||||
if options.remote_assets_url and options.sync:
|
if options.remote_assets_url and options.sync:
|
||||||
if os.path.exists(options.clone_dir):
|
if os.path.exists(options.clone_dir):
|
||||||
launch_command("cd %s && %s" % (options.clone_dir,
|
launch_command("cd %s && %s" % (options.clone_dir,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user