diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-06-22 20:41:53 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-06-22 20:41:53 +0000 |
| commit | 40904c09771e9fed9c512ef8c5467e8d32edc86b (patch) | |
| tree | 0fe0a923c1982c87c5bacf5291f5db18b20388dd /llvm/test | |
| parent | 51897047da6b63ed736d0167cf5fb6391eaa1cb1 (diff) | |
| download | bcm5719-llvm-40904c09771e9fed9c512ef8c5467e8d32edc86b.tar.gz bcm5719-llvm-40904c09771e9fed9c512ef8c5467e8d32edc86b.zip | |
test/Unit: Fix enable shared test to follow check that we have actually loaded
the site config.
llvm-svn: 133641
Diffstat (limited to 'llvm/test')
| -rw-r--r-- | llvm/test/Unit/lit.cfg | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg index 35092964a5c..ba4cbc5d798 100644 --- a/llvm/test/Unit/lit.cfg +++ b/llvm/test/Unit/lit.cfg @@ -30,14 +30,6 @@ if 'TEMP' in os.environ: ### -# If necessary, point the dynamic loader at libLLVM.so. -if config.enable_shared: - shlibpath = config.environment.get(config.shlibpath_var,'') - if shlibpath: - shlibpath = os.pathsep + shlibpath - shlibpath = config.shlibdir + shlibpath - config.environment[config.shlibpath_var] = shlibpath - # Check that the object root is known. if config.test_exec_root is None: # Otherwise, we haven't loaded the site specific configuration (the user is @@ -81,3 +73,11 @@ if config.test_exec_root is None: lit.note('using out-of-tree build at %r' % llvm_obj_root) lit.load_config(config, site_cfg) raise SystemExit + +# If necessary, point the dynamic loader at libLLVM.so. +if config.enable_shared: + shlibpath = config.environment.get(config.shlibpath_var,'') + if shlibpath: + shlibpath = os.pathsep + shlibpath + shlibpath = config.shlibdir + shlibpath + config.environment[config.shlibpath_var] = shlibpath |
