[llvm-commits] [poolalloc] r137440 - in /poolalloc/trunk/test: Makefile lit.cfg lit.site.cfg.in
Will Dietz
wdietz2 at illinois.edu
Fri Aug 12 00:47:50 PDT 2011
Author: wdietz2
Date: Fri Aug 12 02:47:50 2011
New Revision: 137440
URL: http://llvm.org/viewvc/llvm-project?rev=137440&view=rev
Log:
Update lit testing for mainline. LOTS of failures.
Modified:
poolalloc/trunk/test/Makefile
poolalloc/trunk/test/lit.cfg
poolalloc/trunk/test/lit.site.cfg.in
Modified: poolalloc/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=137440&r1=137439&r2=137440&view=diff
==============================================================================
--- poolalloc/trunk/test/Makefile (original)
+++ poolalloc/trunk/test/Makefile Fri Aug 12 02:47:50 2011
@@ -406,22 +406,14 @@
.PHONY: lit lit-report
-#Figure out what our configuration is
-#Better way?
-ifeq ($(ENABLE_OPTIMIZED),1)
-CONFIGURATION := "Release"
-else
-CONFIGURATION := "Debug"
-endif
-
# Pathname to poolalloc object tree
-PADIR := $(LLVM_OBJ_ROOT)/projects/poolalloc
+PADIR := $(PROJ_OBJ_ROOT)
# Pathame to the DSA pass dynamic library
-DSA_SO := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
+DSA_SO := $(PADIR)/$(BuildMode)/lib/libLLVMDataStructure$(SHLIBEXT)
# Pathame to the Assist DSA pass dynamic library
-ADSA_SO := $(PADIR)/$(CONFIGURATION)/lib/libAssistDS$(SHLIBEXT)
+ADSA_SO := $(PADIR)/$(BuildMode)/lib/libAssistDS$(SHLIBEXT)
# Pathname to the PA pass dynamic library
-PA_SO := $(PADIR)/$(CONFIGURATION)/lib/libpoolalloc$(SHLIBEXT)
+PA_SO := $(PADIR)/$(BuildMode)/lib/libpoolalloc$(SHLIBEXT)
DSAOPT := $(PROJ_OBJ_ROOT)/test/tools/dsaopt
ADSAOPT := $(PROJ_OBJ_ROOT)/test/tools/adsaopt
@@ -458,7 +450,7 @@
$(TC_LINK):
@mkdir -p `dirname $@`
@echo "#!/bin/sh" > $@.tmp
- @echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(CONFIGURATION)/lib/libtypechecks_rt.bca ' >> $@.tmp
+ @echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/libtypechecks_rt.bca ' >> $@.tmp
@chmod +x $@.tmp
@mv $@.tmp $@
@@ -466,7 +458,7 @@
$(PA_LINK):
@mkdir -p `dirname $@`
@echo "#!/bin/sh" > $@.tmp
- @echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(CONFIGURATION)/lib/libpoolalloc_rt.bca ' >> $@.tmp
+ @echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/libpoolalloc_rt.bca ' >> $@.tmp
@chmod +x $@.tmp
@mv $@.tmp $@
@@ -474,23 +466,20 @@
@echo "Making LLVM 'lit.site.cfg' file..."
@sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
-e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
- -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
+ -e "s#@LLVM_TOOLS_DIR@#$(LLVMToolDir)#g" \
-e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
-e "s#@PROJ_SRC_ROOT@#$(PROJ_SRC_ROOT)#g" \
+ -e "s#@PROJ_OBJ_ROOT@#$(PROJ_OBJ_ROOT)#g" \
$(PROJ_SRC_ROOT)/test/lit.site.cfg.in > $@
-SETPATH = \
- PATH=$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(LLVMGCCDIR)/bin:$(PROJ_OBJ_ROOT)/test/tools:$(PATH)
-
-TESTSUITE=$(PROJ_OBJ_ROOT)/test
-
#Run the lit tests for this project
+.PHONY: lit lit-report
lit: lit.site.cfg $(TOOLS)
- $(SETPATH) $(MAKE) -C $(LLVM_OBJ_ROOT)/test check-local-lit TESTSUITE=$(TESTSUITE)
+ $(LLVM_SRC_ROOT)/utils/lit/lit.py $(PROJ_OBJ_ROOT)/test --path $(ToolDir) -s -v
#Run the lit tests, but supress all error output--just report the test results.
lit-report: lit.site.cfg $(TOOLS)
- $(SETPATH) $(MAKE) -C $(LLVM_OBJ_ROOT)/test check-local-lit TESTSUITE=$(TESTSUITE) LIT_ARGS=-q
+ $(LLVM_SRC_ROOT)/utils/lit/lit.py $(PROJ_OBJ_ROOT)/test --path $(ToolDir) -q
clean::
-$(RM) -rf `find $(PROJ_OBJ_DIR) -name Output -type d -print`
Modified: poolalloc/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/lit.cfg?rev=137440&r1=137439&r2=137440&view=diff
==============================================================================
--- poolalloc/trunk/test/lit.cfg (original)
+++ poolalloc/trunk/test/lit.cfg Fri Aug 12 02:47:50 2011
@@ -3,9 +3,11 @@
# Configuration file for the 'lit' test runner.
import os
+import sys
+import re
# name: The name of this test suite.
-config.name = 'LLVM'
+config.name = 'PoolAlloc/DSA'
# testFormat: The test format to use to interpret tests.
config.test_format = lit.formats.TclTest()
@@ -17,14 +19,39 @@
# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
+# Tweak PATH for Win32
+if sys.platform in ['win32']:
+ # Seek sane tools in directories and set to $PATH.
+ path = getattr(config, 'lit_tools_dir', None)
+ path = lit.getToolsPath(path,
+ config.environment['PATH'],
+ ['cmp.exe', 'grep.exe', 'sed.exe'])
+ if path is not None:
+ path = os.path.pathsep.join((path,
+ config.environment['PATH']))
+ config.environment['PATH'] = path
+
# test_exec_root: The root path where tests should be run.
llvm_obj_root = getattr(config, 'llvm_obj_root', None)
-if llvm_obj_root is not None:
- config.test_exec_root = os.path.join(llvm_obj_root, 'test')
+proj_obj_root = getattr(config, 'proj_obj_root', None)
+if proj_obj_root is not None:
+ config.test_exec_root = os.path.join(proj_obj_root, 'test')
# Tweak the PATH to include the scripts dir, the tools dir, and the llvm-gcc bin
# dir (if available).
if llvm_obj_root is not None:
+ # Include llvm-gcc first, as the llvm-gcc binaryies will not appear
+ # neither in the tools nor in the scripts dir. However it might be
+ # possible, that some old llvm tools are in the llvm-gcc dir. Adding
+ # llvm-gcc dir first ensures, that those will always be overwritten
+ # by the new tools in llvm_tools_dir. So now outdated tools are used
+ # for testing
+ llvmgcc_dir = getattr(config, 'llvmgcc_dir', None)
+ if llvmgcc_dir:
+ path = os.path.pathsep.join((os.path.join(llvmgcc_dir, 'bin'),
+ config.environment['PATH']))
+ config.environment['PATH'] = path
+
llvm_src_root = getattr(config, 'llvm_src_root', None)
if not llvm_src_root:
lit.fatal('No LLVM source root set!')
@@ -39,14 +66,38 @@
path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
config.environment['PATH'] = path
- llvmgcc_dir = getattr(config, 'llvmgcc_dir', None)
- if llvmgcc_dir:
- path = os.path.pathsep.join((os.path.join(llvmgcc_dir, 'bin'),
+ proj_obj_root = getattr(config, 'proj_obj_root', None)
+ if proj_obj_root:
+ path = os.path.pathsep.join((os.path.join(proj_obj_root, 'test', 'tools'),
config.environment['PATH']))
config.environment['PATH'] = path
-# Propogate 'HOME' through the environment.
-config.environment['HOME'] = os.environ['HOME']
+
+# Propagate 'HOME' through the environment.
+if 'HOME' in os.environ:
+ config.environment['HOME'] = os.environ['HOME']
+
+# Propagate 'INCLUDE' through the environment.
+if 'INCLUDE' in os.environ:
+ config.environment['INCLUDE'] = os.environ['INCLUDE']
+
+# Propagate 'LIB' through the environment.
+if 'LIB' in os.environ:
+ config.environment['LIB'] = os.environ['LIB']
+
+# Propagate the temp directory. Windows requires this because it uses \Windows\
+# if none of these are present.
+if 'TMP' in os.environ:
+ config.environment['TMP'] = os.environ['TMP']
+if 'TEMP' in os.environ:
+ config.environment['TEMP'] = os.environ['TEMP']
+
+# Propagate LLVM_SRC_ROOT into the environment.
+config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '')
+
+# Propagate PYTHON_EXECUTABLE into the environment
+config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
+ '')
###
@@ -54,6 +105,8 @@
# Check that the object root is known.
if config.test_exec_root is None:
+ lit.fatal('Object root unknown!')
+
# Otherwise, we haven't loaded the site specific configuration (the user is
# probably trying to run on a test file directly, and either the site
# configuration hasn't been created by the build system, or we are in an
@@ -103,18 +156,19 @@
site_exp = {}
# FIXME: Implement lit.site.cfg.
for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
- m = re.match('set ([^ ]+) "([^"]*)"', line)
+ m = re.match('set ([^ ]+) "(.*)"', line)
if m:
site_exp[m.group(1)] = m.group(2)
# Add substitutions.
config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
-for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',
+for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
+ 'llvmshlibdir',
'bugpoint_topts']:
if sub in ('llvmgcc', 'llvmgxx'):
config.substitutions.append(('%' + sub,
- site_exp[sub] + ' -emit-llvm -w'))
+ site_exp[sub] + ' %emitir -w'))
# FIXME: This is a hack to avoid LLVMC tests failing due to a clang driver
# warning when passing in "-fexceptions -fno-exceptions".
elif sub == 'compile_cxx':
@@ -123,11 +177,63 @@
else:
config.substitutions.append(('%' + sub, site_exp[sub]))
+# For each occurrence of an llvm tool name as its own word, replace it
+# with the full path to the build directory holding that tool. This
+# ensures that we are testing the tools just built and not some random
+# tools that might happen to be in the user's PATH. Thus this list
+# includes every tool placed in $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
+# (llvm_tools_dir in lit parlance).
+ # Don't match 'bugpoint-' or 'clang-'.
+ # Don't match '/clang'.
+if os.pathsep == ';':
+ pathext = os.environ.get('PATHEXT', '').split(';')
+else:
+ pathext = ['']
+for pattern in [r"\bbugpoint\b(?!-)", r"(?<!/)\bclang\b(?!-)",
+ r"\bgold\b",
+ r"\bllc\b", r"\blli\b",
+ r"\bllvm-ar\b", r"\bllvm-as\b",
+ r"\bllvm-bcanalyzer\b", r"\bllvm-config\b",
+ r"\bllvm-diff\b", r"\bllvm-dis\b",
+ r"\bllvm-extract\b", r"\bllvm-ld\b",
+ r"\bllvm-link\b", r"\bllvm-mc\b",
+ r"\bllvm-nm\b", r"\bllvm-prof\b",
+ r"\bllvm-ranlib\b", r"\bllvm-shlib\b",
+ r"\bllvm-stub\b", r"\bllvm2cpp\b",
+ # Don't match '-llvmc'.
+ r"(?<!-)\bllvmc\b", r"\blto\b",
+ # Don't match '.opt', '-opt',
+ # '^opt' or '/opt'.
+ r"\bmacho-dump\b", r"(?<!\.|-|\^|/)\bopt\b",
+ r"\btblgen\b", r"\bFileCheck\b",
+ r"\bFileUpdate\b", r"\bc-index-test\b",
+ r"\bfpcmp\b", r"\bllvm-PerfectShuffle\b",
+ # Handle these specially as they are strings searched
+ # for during testing.
+ r"\| \bcount\b", r"\| \bnot\b"]:
+ # Extract the tool name from the pattern. This relies on the tool
+ # name being surrounded by \b word match operators. If the
+ # pattern starts with "| ", include it in the string to be
+ # substituted.
+ substitution = re.sub(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
+ r"\2" + llvm_tools_dir + "/" + r"\4",
+ pattern)
+ for ext in pathext:
+ substitution_ext = substitution + ext
+ if os.path.exists(substitution_ext):
+ substitution = substitution_ext
+ break
+ config.substitutions.append((pattern, substitution))
+
excludes = []
# Provide target_triple for use in XFAIL and XTARGET.
config.target_triple = site_exp['target_triplet']
+# When running under valgrind, we mangle '-vg' or '-vg_leak' onto the end of the
+# triple so we can check it with XFAIL and XTARGET.
+config.target_triple += lit.valgrindTriple
+
# Provide llvm_supports_target for use in local configs.
targets = set(site_exp["TARGETS_TO_BUILD"].split())
def llvm_supports_target(name):
@@ -136,16 +242,13 @@
def llvm_supports_darwin_and_target(name):
return 'darwin' in config.target_triple and llvm_supports_target(name)
-langs = set(site_exp['llvmgcc_langs'].split(','))
+langs = set([s.strip() for s in site_exp['llvmgcc_langs'].split(',')])
def llvm_gcc_supports(name):
- return name in langs
+ return name.strip() in langs
-bindings = set(site_exp['llvm_bindings'].split(','))
+bindings = set([s.strip() for s in site_exp['llvm_bindings'].split(',')])
def llvm_supports_binding(name):
- return name in bindings
-
-config.conditions["TARGET"] = llvm_supports_target
-config.conditions["BINDING"] = llvm_supports_binding
+ return name.strip() in bindings
# Provide on_clone hook for reading 'dg.exp'.
import os
@@ -197,3 +300,22 @@
lit.error('unable to understand %r:\n%s' % (libPath, lib))
config.on_clone = on_clone
+
+### Features
+
+# Shell execution
+if sys.platform not in ['win32'] or lit.getBashPath() != '':
+ config.available_features.add('shell')
+
+# Loadable module
+# FIXME: This should be supplied by Makefile or autoconf.
+if sys.platform in ['win32', 'cygwin']:
+ loadable_module = (config.enable_shared == 1)
+else:
+ loadable_module = True
+
+if loadable_module:
+ config.available_features.add('loadable_module')
+
+## if config.enable_assertions:
+## config.available_features.add('asserts')
Modified: poolalloc/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/lit.site.cfg.in?rev=137440&r1=137439&r2=137440&view=diff
==============================================================================
--- poolalloc/trunk/test/lit.site.cfg.in (original)
+++ poolalloc/trunk/test/lit.site.cfg.in Fri Aug 12 02:47:50 2011
@@ -4,6 +4,8 @@
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.llvmgcc_dir = "@LLVMGCCDIR@"
+config.proj_src_root = "@PROJ_SRC_ROOT@"
+config.proj_obj_root = "@PROJ_OBJ_ROOT@"
# Let the main config do the real work.
lit.load_config(config, "@PROJ_SRC_ROOT@/test/lit.cfg")
More information about the llvm-commits
mailing list