6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-08 21:32:39 +00:00
Code Issues Projects Releases Wiki Activity

[lit] Eliminate mustExist parameter from TestingConfig.frompath().

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188034 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2013-08-09 00:09:02 +00:00
parent 3279653eb8
commit 49e51429c1
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/lit/lit/LitConfig.py
View File

@ -72,8 +72,7 @@ class LitConfig:
path."""
if self.debug:
self.note('load_config from %r' % path)
return lit.TestingConfig.TestingConfig.frompath(
path, config, self, mustExist = True)
return lit.TestingConfig.TestingConfig.frompath(path, config, self)
def getBashPath(self):
"""getBashPath - Get the path to 'bash'"""

66
utils/lit/lit/TestingConfig.py
View File

@ -9,7 +9,7 @@ class TestingConfig:
"""
@staticmethod
def frompath(path, config, litConfig, mustExist=True):
def frompath(path, config, litConfig):
"""
frompath(path, config, litConfig, mustExist) -> TestingConfig
@ -58,39 +58,37 @@ class TestingConfig:
available_features = available_features,
pipefail = True)
if os.path.exists(path):
# FIXME: Improve detection and error reporting of errors in the
# config file.
f = open(path)
cfg_globals = dict(globals())
cfg_globals['config'] = config
cfg_globals['lit'] = litConfig
cfg_globals['__file__'] = path
try:
data = f.read()
if PY2:
exec("exec data in cfg_globals")
else:
exec(data, cfg_globals)
if litConfig.debug:
litConfig.note('... loaded config %r' % path)
except SystemExit:
e = sys.exc_info()[1]
# We allow normal system exit inside a config file to just
# return control without error.
if e.args:
raise
except:
import traceback
litConfig.fatal(
'unable to parse config file %r, traceback: %s' % (
path, traceback.format_exc()))
f.close()
else:
if mustExist:
litConfig.fatal('unable to load config from %r ' % path)
elif litConfig.debug:
litConfig.note('... config not found - %r' %path)
# Load the config script data.
f = open(path)
try:
data = f.read()
except:
litConfig.fatal('unable to load config file: %r' % (path,))
f.close()
# Execute the config script to initialize the object.
cfg_globals = dict(globals())
cfg_globals['config'] = config
cfg_globals['lit'] = litConfig
cfg_globals['__file__'] = path
try:
if PY2:
exec("exec data in cfg_globals")
else:
exec(data, cfg_globals)
if litConfig.debug:
litConfig.note('... loaded config %r' % path)
except SystemExit:
e = sys.exc_info()[1]
# We allow normal system exit inside a config file to just
# return control without error.
if e.args:
raise
except:
import traceback
litConfig.fatal(
'unable to parse config file %r, traceback: %s' % (
path, traceback.format_exc()))
config.finish(litConfig)
return config

2
utils/lit/lit/discovery.py
View File

@ -42,7 +42,7 @@ def getTestSuite(item, litConfig, cache):
if litConfig.debug:
litConfig.note('loading suite config %r' % cfgpath)
cfg = TestingConfig.frompath(cfgpath, None, litConfig, mustExist = True)
cfg = TestingConfig.frompath(cfgpath, None, litConfig)
source_root = os.path.realpath(cfg.test_source_root or path)
exec_root = os.path.realpath(cfg.test_exec_root or path)
return Test.TestSuite(cfg.name, source_root, exec_root, cfg), ()