6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-13 01:15:32 +00:00
Code Issues Projects Releases Wiki Activity

Add support to lit for build mode requirements. e.g.

Browse Source 
REQUIRES: Asserts
REQUIRES: Debug

This required chaining test configuration properties. It seems like a
generally good thing to do.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133131 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick 2011-06-16 01:33:35 +00:00
parent 6fce128dd1
commit 05c087d893
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Makefile
View File

@ -176,6 +176,7 @@ lit.site.cfg: site.exp
@$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp
@$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
@$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
@$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> lit.tmp
@$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp @$(ECHOPATH) s=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp
@$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp
@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp

2
test/lit.site.cfg.in
View File

@ -4,7 +4,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@"
config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.llvmgcc_dir = "@LLVMGCCDIR@" config.llvmgcc_dir = "@LLVMGCCDIR@"
config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.llvm_build_modes = "@LLVM_BUILD_MODE@".split('+')
config.python_executable = "@PYTHON_EXECUTABLE@" config.python_executable = "@PYTHON_EXECUTABLE@"
config.enable_shared = @ENABLE_SHARED@ config.enable_shared = @ENABLE_SHARED@

6
utils/lit/lit/TestRunner.py
View File

@ -473,9 +473,11 @@ def parseIntegratedTestScript(test, normalize_slashes=False):
if script[-1][-1] == '\\': if script[-1][-1] == '\\':
return (Test.UNRESOLVED, "Test has unterminated run lines (with '\\')") return (Test.UNRESOLVED, "Test has unterminated run lines (with '\\')")
# Check that we have the required features: # Check that we have the required features or build modes:
missing_required_features = [f for f in requires missing_required_features = [f for f in requires
if f not in test.config.available_features] if f not in test.config.available_features
and f not in test.config.llvm_build_modes]
if missing_required_features: if missing_required_features:
msg = ', '.join(missing_required_features) msg = ', '.join(missing_required_features)
return (Test.UNSUPPORTED, return (Test.UNSUPPORTED,

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

@ -74,6 +74,7 @@ class TestingConfig:
def clone(self, path): def clone(self, path):
# FIXME: Chain implementations? # FIXME: Chain implementations?
# See attribute chaining in finish()
# #
# FIXME: Allow extra parameters? # FIXME: Allow extra parameters?
cfg = TestingConfig(self, self.name, self.suffixes, self.test_format, cfg = TestingConfig(self, self.name, self.suffixes, self.test_format,
@ -101,3 +102,9 @@ class TestingConfig:
# files. Should we distinguish them? # files. Should we distinguish them?
self.test_source_root = str(self.test_source_root) self.test_source_root = str(self.test_source_root)
self.excludes = set(self.excludes) self.excludes = set(self.excludes)
# chain attributes by copying them
if self.parent:
for k,v in vars(self.parent).items():
if not hasattr(self, k):
setattr(self, k, v)