This is a small patch with a couple of improvements for running lit with --debug:

1. Added a status note when a config file is loaded directly with load_config. This helps notice loads of lit.cfg from lit.site.cfg
2. Added a status note on the result of a config load. Previously, it was just notifying that it tries to load a config file. Now it will also say whether the load succeeded or the file wasn't found

The two changes give better visibility into which config files were actually loaded by lit. The effect is only on --debug runs.

Patch by Eli Bendersky!

llvm-svn: 149932
This commit is contained in:
Andrew Trick 2012-02-06 23:34:52 +00:00
parent 4a090f62a5
commit 3e1478c558
2 changed files with 9 additions and 2 deletions

View File

@ -61,6 +61,8 @@ class LitConfig:
"""load_config(config, path) - Load a config object from an alternate
path."""
from TestingConfig import TestingConfig
if self.debug:
self.note('load_config from %r' % path)
return TestingConfig.frompath(path, config.parent, self,
mustExist = True,
config = config)

View File

@ -50,14 +50,19 @@ class TestingConfig:
cfg_globals['__file__'] = path
try:
exec f in cfg_globals
if litConfig.debug:
litConfig.note('... loaded config %r' % path)
except SystemExit,status:
# We allow normal system exit inside a config file to just
# return control without error.
if status.args:
raise
f.close()
elif mustExist:
litConfig.fatal('unable to load config from %r ' % path)
else:
if mustExist:
litConfig.fatal('unable to load config from %r ' % path)
elif litConfig.debug:
litConfig.note('... config not found - %r' %path)
config.finish(litConfig)
return config