diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-06-28 00:16:51 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-06-28 00:16:51 +0000 |
| commit | 96f41a1b0f9060f302c7857f98f62b55abc75a32 (patch) | |
| tree | 275599f5d4bafedcf73ee4d758df8aea1e9ae532 /test/lit.cfg | |
| parent | 0bcbd1df7a204e1e512f1a27066d725309de1b13 (diff) | |
| download | llvm-96f41a1b0f9060f302c7857f98f62b55abc75a32.tar.gz llvm-96f41a1b0f9060f302c7857f98f62b55abc75a32.tar.bz2 llvm-96f41a1b0f9060f302c7857f98f62b55abc75a32.tar.xz | |
Remove 'site.exp' building from both CMake and configure+make.
This is another vestige of the DejaGNU roots. There were FIXMEs in the
lit setup to add a 'lit.site.cfg', which has been around for quite some
time now, so I've properly switched the handling of the 4 things
actually used in site.exp to go through lit.site.cfg now. No more
parsing of the .exp file, one fewer configure-style generated file,
etc., etc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159313 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lit.cfg')
| -rw-r--r-- | test/lit.cfg | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 2383d8fe79..93360c7c7c 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -132,18 +132,6 @@ if config.test_exec_root is None: ### -# Load site data from DejaGNU's site.exp. -import re -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) - if m: - site_exp[m.group(1)] = m.group(2) - -# 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 @@ -164,9 +152,10 @@ if jit_impl_cfg == 'mcjit': else: config.substitutions.append( ('%lli', 'lli') ) -# Add substitutions. -for sub in ['link', 'shlibext', 'ocamlopt', 'llvmshlibdir']: - config.substitutions.append(('%' + sub, site_exp[sub])) +# Add site-specific substitutions. +config.substitutions.append( ('%ocamlopt', config.ocamlopt_executable) ) +config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) +config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) # 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 |