Skip to content

Commit 9d88543

Browse files
authored
[AIX] Use internal lit shell for TableGen instead of a global setting (#113627)
This is to address the latest lit regressions https://lab.llvm.org/buildbot/#/builders/64/builds/1285 caused by using the internal lit shell. This change will limit using the internal lit shell to TableGen on AIX so we do not hit these regressions.
1 parent 305a1ce commit 9d88543

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

llvm/test/TableGen/lit.local.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1+
import platform
2+
import lit.formats
3+
14
config.suffixes = [".td"]
25
config.excludes = ["Common", "Inputs"]
6+
7+
# AIX 'diff' command doesn't support --strip-trailing-cr, but the internal
8+
# python implementation does, so use that for cross platform compatibility
9+
if platform.system() == "AIX":
10+
config.test_format = lit.formats.ShTest()

llvm/utils/lit/lit/llvm/config.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ def __init__(self, lit_config, config):
5757
self.lit_config.note("using lit tools: {}".format(path))
5858
lit_path_displayed = True
5959

60-
if platform.system() == "AIX":
61-
# Diff on AIX doesn't have all the required features (see
62-
# https://github.com/llvm/llvm-project/pull/108871 and
63-
# https://github.com/llvm/llvm-project/pull/112997#issuecomment-2429656192)
64-
# so always use the internal shell.
65-
self.use_lit_shell = True
66-
6760
if platform.system() == "OS/390":
6861
self.with_environment("_BPXK_AUTOCVT", "ON")
6962
self.with_environment("_TAG_REDIR_IN", "TXT")

0 commit comments

Comments
 (0)