[PATCH] D37756: [lit] Force site configs to be run before source-tree configs

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 19 15:54:43 PDT 2017


Actually wait, the problem is that it needs to *find* FileCheck.
Regardless, I can fix this.  I'll submit a followup review for you later.

On Tue, Sep 19, 2017 at 3:53 PM Zachary Turner <zturner at google.com> wrote:

> Can you try this patch:
>
> ```
> diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg
> index f2ecaa6d417..09058f990ea 100644
> --- a/llvm/utils/lit/tests/lit.cfg
> +++ b/llvm/utils/lit/tests/lit.cfg
> @@ -65,6 +65,7 @@ if sys.platform.startswith('win') or
> sys.platform.startswith('cygwin'):
>      config.available_features.add('windows')
>
>  # Add llvm tools directory if this config is being loaded indirectly
> -if config.llvm_tools_dir is not None:
> -    path = os.path.pathsep.join((config.llvm_tools_dir,
> config.environment['PATH']))
> +llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
> +if llvm_tools_dir:
> +    path = os.path.pathsep.join((llvm_tools_dir,
> config.environment['PATH']))
>      config.environment['PATH'] = path
> ```
>
> On Tue, Sep 19, 2017 at 3:47 PM Jordan Rose via Phabricator <
> reviews at reviews.llvm.org> wrote:
>
>> jordan_rose added a comment.
>>
>> Previously I was just able to do this:
>>
>>   utils/lit/lit.py --time-tests utils/lit/tests/setup-script.py -sv
>>
>> as long as FileCheck was in my PATH. I can see why that's not an
>> interesting config for a real project that actually has an interesting
>> lit.site.cfg, but for just working on lit it seems redundant.
>>
>>
>> Repository:
>>   rL LLVM
>>
>> https://reviews.llvm.org/D37756
>>
>>
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170919/d8a00ca1/attachment.html>


More information about the llvm-commits mailing list