aboutsummaryrefslogtreecommitdiff
path: root/test/Unit
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-06-22 20:41:53 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-06-22 20:41:53 +0000
commit46d061c0fb8965b9cf722d628d2b02bec38ce9df (patch)
tree023af72f2fe6e1d8dc21858b81bc15a0dcfadaa3 /test/Unit
parentd7d71a18597e7f3b88055e3f3dde09d8648233ee (diff)
test/Unit: Fix enable shared test to follow check that we have actually loaded
the site config. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133641 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Unit')
-rw-r--r--test/Unit/lit.cfg16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 35092964a5..ba4cbc5d79 100644
--- a/test/Unit/lit.cfg
+++ b/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