This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Ensure correct extension for llvm-lit is used on Windows when LLVM_INSTALL_UTILS is enabled.
ClosedPublic

Authored by dgg5503 on Apr 21 2022, 12:25 PM.

Details

Summary

D77110 initially added support for setting LLVM_CONFIG_DEFAULT_EXTERNAL_LIT
to llvm-lit in the install directory if LLVM_INSTALL_UTILS is on.

D79144 ensured that, on Windows, llvm-lit.py is correctly set for
LLVM_CONFIG_DEFAULT_EXTERNAL_LIT within the context of the build area,
however, it did not account for the install area which is the latter set
directive for this same variable.

This patch ensures that LLVM_CONFIG_DEFAULT_EXTERNAL_LIT under the install
area uses llvm-lit.py under Windows since llvm-lit without the extension
is not created.

Diff Detail

Event Timeline

dgg5503 created this revision.Apr 21 2022, 12:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 21 2022, 12:25 PM
Herald added a subscriber: mgorny. · View Herald Transcript
dgg5503 requested review of this revision.Apr 21 2022, 12:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 21 2022, 12:25 PM
vvereschaka accepted this revision.Apr 21 2022, 3:11 PM

Hi @dgg5503, thank you, LGTM, but the pre-build status is failed. I don't see that failing of those tests are related with these changes. Anyway, would you double check it just in case?

This revision is now accepted and ready to land.Apr 21 2022, 3:11 PM

Hi @vvereschaka, thank you for the quick approval! I'm not entirely sure why the tests are so flaky especially since I was able to pass all LIT tests under Windows and Linux locally. I've re-ran the pre-merge build 5 times and it appears that the three configurations pass if you combine runs 1 and 3. Is this enough to safely merge or should I continue rebuilding until all configurations passes?

If it is acceptable to merge, may you please submit this commit on my behalf as I do not have commit access? Feel free to use the following information for commit authoring:
Name: Douglas Gliner
E-mail: dgg5503@rit.edu

@dgg5503, I did one more rebuild and this time the result completely different. In comparison with the previous build, where libcxx ci and windows tests have failed, this time all those tests have passed, but the debian target tests have failed. I suppose, because these changes touch the common cmake configuration file, it triggers all possible cases/targets for the builds and not all of these tests are work correctly in that time.
So, the changes are not related with these failed tests. I'll commit your changes.

This revision was landed with ongoing or failed builds.Apr 28 2022, 8:43 PM
This revision was automatically updated to reflect the committed changes.