Skip to content

[AIX] Use internal lit shell for TableGen instead of a global setting #113627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhina-sree merged 3 commits into from
Oct 25, 2024
Merged

[AIX] Use internal lit shell for TableGen instead of a global setting #113627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c2ea23
Revert "[lit][aix] Always use internal lit shell on AIX (#113355)"
abhina-sree Oct 24, 2024
a7a85bf
Use internal lit shell for TableGen only
abhina-sree Oct 24, 2024
4332bc8
guard for AIX only
abhina-sree Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions llvm/test/TableGen/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
import platform
import lit.formats

config.suffixes = [".td"]
config.excludes = ["Common", "Inputs"]

# AIX 'diff' command doesn't support --strip-trailing-cr, but the internal
# python implementation does, so use that for cross platform compatibility
if platform.system() == "AIX":
config.test_format = lit.formats.ShTest()
7 changes: 0 additions & 7 deletions llvm/utils/lit/lit/llvm/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@ def __init__(self, lit_config, config):
self.lit_config.note("using lit tools: {}".format(path))
lit_path_displayed = True

if platform.system() == "AIX":
# Diff on AIX doesn't have all the required features (see
# https://github.com/llvm/llvm-project/pull/108871 and
# https://github.com/llvm/llvm-project/pull/112997#issuecomment-2429656192)
# so always use the internal shell.
self.use_lit_shell = True

if platform.system() == "OS/390":
self.with_environment("_BPXK_AUTOCVT", "ON")
self.with_environment("_TAG_REDIR_IN", "TXT")
Expand Down
Loading