Author: hans Date: Mon Aug 6 23:57:36 2018 New Revision: 339102 URL: http://llvm.org/viewvc/llvm-project?rev=339102&view=rev Log: Merging r338627: ------------------------------------------------------------------------ r338627 | mgorny | 2018-08-01 22:38:22 +0200 (Wed, 01 Aug 2018) | 7 lines
[test] Fix %hmaptool path for standalone builds Fix %hmaptool path to refer to clang_tools_dir instead of llvm_tools_dir, in order to fix standalone builds. The tool is built as part of clang, so it won't be found in installed LLVM tools. Differential Revision: https://reviews.llvm.org/D50156 ------------------------------------------------------------------------ Modified: cfe/branches/release_70/ (props changed) cfe/branches/release_70/test/lit.cfg.py Propchange: cfe/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 6 23:57:36 2018 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:338552-338553,338602,338749,338942 +/cfe/trunk:338552-338553,338602,338627,338749,338942 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_70/test/lit.cfg.py URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/lit.cfg.py?rev=339102&r1=339101&r2=339102&view=diff ============================================================================== --- cfe/branches/release_70/test/lit.cfg.py (original) +++ cfe/branches/release_70/test/lit.cfg.py Mon Aug 6 23:57:36 2018 @@ -71,7 +71,7 @@ llvm_config.add_tool_substitutions(tools config.substitutions.append( ('%hmaptool', "'%s' %s" % (config.python_executable, - os.path.join(config.llvm_tools_dir, 'hmaptool')))) + os.path.join(config.clang_tools_dir, 'hmaptool')))) # Plugins (loadable modules) # TODO: This should be supplied by Makefile or autoconf. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits