diff options
author | Zachary Turner <zturner@google.com> | 2017-09-15 02:56:40 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-09-15 02:56:40 +0000 |
commit | e765db3a13ea619ba6a7521e81545c96d8b336a1 (patch) | |
tree | 81429db48ab6d393a99255bb592c9b83b4b4f15c /test/profile | |
parent | 973030f71da9f1620364652baca380d2df6bfd8d (diff) |
Revert "[lit] Force site configs to run before source-tree configs"
This patch is still breaking several multi-stage compiler-rt bots.
I already know what the fix is, but I want to get the bots green
for now and then try re-applying in the morning.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313335 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/profile')
-rw-r--r-- | test/profile/lit.cfg | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/profile/lit.cfg b/test/profile/lit.cfg index 7f0d95a9a..9ca394212 100644 --- a/test/profile/lit.cfg +++ b/test/profile/lit.cfg @@ -22,6 +22,17 @@ if hasattr(config, 'profile_lit_binary_dir') and \ config.profile_lit_binary_dir is not None: config.test_exec_root = os.path.join(config.profile_lit_binary_dir, config.name) +# If the above check didn't work, we're probably in the source tree. Use some +# magic to re-execute from the build tree. +if config.test_exec_root is None: + # The magic relies on knowing compilerrt_site_basedir. + compilerrt_basedir = lit_config.params.get('compilerrt_site_basedir', None) + if compilerrt_basedir: + site_cfg = os.path.join(compilerrt_basedir, 'profile', 'lit.site.cfg') + if os.path.exists(site_cfg): + lit_config.load_config(config, site_cfg) + raise SystemExit + if config.host_os in ['Linux']: extra_link_flags = ["-ldl"] else: |