clang: tests unable to find hmaptool in stand-alone builds

[llvmbot]

Bugzilla Link	38407
Resolution	FIXED
Resolved on	Aug 06, 2018 23:58
Version	7.0
OS	Linux
Blocks	#37754
Reporter	LLVM Bugzilla Contributor
CC	@zmodem
Fixed by commit(s)	r338627 r339102

Extended Description

The following clang tests fail in stand-alone builds:

---

Failing Tests (5):
Clang :: Modules/double-quotes.m
Clang :: Modules/framework-public-includes-private.m
Clang :: Preprocessor/headermap-rel.c
Clang :: Preprocessor/headermap-rel2.c
Clang :: Preprocessor/nonportable-include-with-hmap.c

The issue is wrong path to hmaptool:

Command Output (stderr):

• : 'RUN: at line 3'
• rm -rf /var/tmp/portage/sys-devel/clang-7.0.9999/work/x/y/clang-7.0.9999-abi_x86_64.amd64/test/Modules/Output/double-quotes.m.tmp
• : 'RUN: at line 4'
• mkdir /var/tmp/portage/sys-devel/clang-7.0.9999/work/x/y/clang-7.0.9999-abi_x86_64.amd64/test/Modules/Output/double-quotes.m.tmp
• : 'RUN: at line 6'
• /var/tmp/portage/sys-devel/clang-7.0.9999/temp/python2.7/bin/python /usr/lib64/llvm/7/bin/hmaptool write /var/tmp/portage/sys-devel/clang-7.0.9999/work/x/y/clang-7.0.9999/test/Modules/Inputs/double-quotes/a.hmap.json /var/tmp/portage/sys-devel/clang-7.0.9999/work/x/y/clang-7.0.9999-abi_x86_64.amd64/test/Modules/Output/double-quotes.m.tmp/a.hmap
  /usr/bin/python2.7: can't open file '/usr/lib64/llvm/7/bin/hmaptool': [Errno 2] No such file or directory

--

I've submitted a potential fix as https://reviews.llvm.org/D50156. Once it's committed to trunk, please backport to release_70.

[llvmbot]

Now in trunk as r338627.

[zmodem]

Now in trunk as r338627.

Merged in r339102.