Thanks Ben! On Fri, Jun 22, 2018 at 2:51 AM Benjamin Kramer via cfe-commits <cfe-commits@lists.llvm.org> wrote: > > Author: d0k > Date: Fri Jun 22 02:46:40 2018 > New Revision: 335330 > > URL: http://llvm.org/viewvc/llvm-project?rev=335330&view=rev > Log: > [hmaptool] Turn %hmaptool into a proper substitution > > This is still super ugly, but at least it doesn't require working > directories to just line up perfectly for python to find the tool. > > Modified: > cfe/trunk/test/Modules/crash-vfs-headermaps.m > cfe/trunk/test/Preprocessor/headermap-rel.c > cfe/trunk/test/Preprocessor/headermap-rel2.c > cfe/trunk/test/Preprocessor/nonportable-include-with-hmap.c > cfe/trunk/test/lit.cfg.py > > Modified: cfe/trunk/test/Modules/crash-vfs-headermaps.m > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-headermaps.m?rev=335330&r1=335329&r2=335330&view=diff > ============================================================================== > --- cfe/trunk/test/Modules/crash-vfs-headermaps.m (original) > +++ cfe/trunk/test/Modules/crash-vfs-headermaps.m Fri Jun 22 02:46:40 2018 > @@ -3,7 +3,7 @@ > // RUN: rm -rf %t > // RUN: mkdir -p %t/m %t/i/Foo.framework/Headers > // RUN: echo '// Foo.h' > %t/i/Foo.framework/Headers/Foo.h > -// RUN: '%python' hmaptool write > %S/../Preprocessor/Inputs/headermap-rel/foo.hmap.json %t/i/foo.hmap > +// RUN: %hmaptool write > %S/../Preprocessor/Inputs/headermap-rel/foo.hmap.json %t/i/foo.hmap > > // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ > // RUN: %clang -fsyntax-only -fmodules -fmodules-cache-path=%t/m %s \ > > Modified: cfe/trunk/test/Preprocessor/headermap-rel.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/headermap-rel.c?rev=335330&r1=335329&r2=335330&view=diff > ============================================================================== > --- cfe/trunk/test/Preprocessor/headermap-rel.c (original) > +++ cfe/trunk/test/Preprocessor/headermap-rel.c Fri Jun 22 02:46:40 2018 > @@ -1,5 +1,5 @@ > // RUN: rm -f %t.hmap > -// RUN: '%python' hmaptool write %S/Inputs/headermap-rel/foo.hmap.json > %t.hmap > +// RUN: %hmaptool write %S/Inputs/headermap-rel/foo.hmap.json %t.hmap > // RUN: %clang_cc1 -E %s -o %t.i -I %t.hmap -F %S/Inputs/headermap-rel > // RUN: FileCheck %s -input-file %t.i > > > Modified: cfe/trunk/test/Preprocessor/headermap-rel2.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/headermap-rel2.c?rev=335330&r1=335329&r2=335330&view=diff > ============================================================================== > --- cfe/trunk/test/Preprocessor/headermap-rel2.c (original) > +++ cfe/trunk/test/Preprocessor/headermap-rel2.c Fri Jun 22 02:46:40 2018 > @@ -1,5 +1,5 @@ > // RUN: rm -f %t.hmap > -// RUN: '%python' hmaptool write > %S/Inputs/headermap-rel2/project-headers.hmap.json %t.hmap > +// RUN: %hmaptool write %S/Inputs/headermap-rel2/project-headers.hmap.json > %t.hmap > // RUN: %clang_cc1 -v -fsyntax-only %s -iquote %t.hmap -isystem > %S/Inputs/headermap-rel2/system/usr/include -I %S/Inputs/headermap-rel2 -H > // RUN: %clang_cc1 -fsyntax-only %s -iquote %t.hmap -isystem > %S/Inputs/headermap-rel2/system/usr/include -I %S/Inputs/headermap-rel2 -H 2> > %t.out > // RUN: FileCheck %s -input-file %t.out > > Modified: cfe/trunk/test/Preprocessor/nonportable-include-with-hmap.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/nonportable-include-with-hmap.c?rev=335330&r1=335329&r2=335330&view=diff > ============================================================================== > --- cfe/trunk/test/Preprocessor/nonportable-include-with-hmap.c (original) > +++ cfe/trunk/test/Preprocessor/nonportable-include-with-hmap.c Fri Jun 22 > 02:46:40 2018 > @@ -1,5 +1,5 @@ > // RUN: rm -f %t.hmap > -// RUN: '%python' hmaptool write %S/Inputs/nonportable-hmaps/foo.hmap.json > %t.hmap > +// RUN: %hmaptool write %S/Inputs/nonportable-hmaps/foo.hmap.json %t.hmap > // RUN: %clang_cc1 -Eonly \ > // RUN: -I%t.hmap \ > // RUN: -I%S/Inputs/nonportable-hmaps \ > > Modified: cfe/trunk/test/lit.cfg.py > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg.py?rev=335330&r1=335329&r2=335330&view=diff > ============================================================================== > --- cfe/trunk/test/lit.cfg.py (original) > +++ cfe/trunk/test/lit.cfg.py Fri Jun 22 02:46:40 2018 > @@ -58,7 +58,7 @@ tool_dirs = [config.clang_tools_dir, con > > tools = [ > 'c-index-test', 'clang-check', 'clang-diff', 'clang-format', > 'clang-tblgen', > - 'opt', 'hmaptool', > + 'opt', > ToolSubst('%clang_func_map', command=FindTool( > 'clang-func-mapping'), unresolved='ignore'), > ] > @@ -69,6 +69,10 @@ if config.clang_examples: > > llvm_config.add_tool_substitutions(tools, tool_dirs) > > +config.substitutions.append( > + ('%hmaptool', '%s %s' % (config.python_executable, > + os.path.join(config.llvm_tools_dir, > 'hmaptool')))) > + > # Plugins (loadable modules) > # TODO: This should be supplied by Makefile or autoconf. > if sys.platform in ['win32', 'cygwin']: > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
-- Bruno Cardoso Lopes http://www.brunocardoso.cc _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
