aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnie Zhu <60797237+connieyzhu@users.noreply.github.com>2024-08-27 10:30:04 -0700
committerGitHub <noreply@github.com>2024-08-27 10:30:04 -0700
commit6b86f51b98197420b3d9bb44a1d9ae3d3b118df8 (patch)
tree3f5f1594344000ffb1544e1cae07dc2ec919dcf8
parented2f90902c6adac8d702ce41f29fed6ffd9aa852 (diff)
downloadllvm-6b86f51b98197420b3d9bb44a1d9ae3d3b118df8.zip
llvm-6b86f51b98197420b3d9bb44a1d9ae3d3b118df8.tar.gz
llvm-6b86f51b98197420b3d9bb44a1d9ae3d3b118df8.tar.bz2
[polly][llvm-lit] Enabled lit internal shell for polly test suite (#105704)
This patch sets lit's internal shell to be the default shell when running polly tests. This is one of the milestones to resolving the meta-issue: https://github.com/llvm/llvm-project/issues/102704.
-rw-r--r--polly/test/UnitIsl/lit.cfg11
-rw-r--r--polly/test/lit.cfg11
2 files changed, 18 insertions, 4 deletions
diff --git a/polly/test/UnitIsl/lit.cfg b/polly/test/UnitIsl/lit.cfg
index 9c732a15..0944d543 100644
--- a/polly/test/UnitIsl/lit.cfg
+++ b/polly/test/UnitIsl/lit.cfg
@@ -16,8 +16,15 @@ config.name = 'Polly - isl unit tests'
#
# For now we require '&&' between commands, until they get globally killed and
# the test runner updated.
-execute_external = platform.system() != 'Windows'
-config.test_format = lit.formats.ShTest(execute_external)
+#
+# We prefer the lit internal shell which provides a better user experience on failures
+# unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0 env var.
+use_lit_shell = True
+lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
+if lit_shell_env:
+ use_lit_shell = not lit.util.pythonize_bool(lit_shell_env)
+
+config.test_format = lit.formats.ShTest(execute_external=not use_lit_shell)
# suffixes: A list of file extensions to treat as test files.
config.suffixes = ['.sh']
diff --git a/polly/test/lit.cfg b/polly/test/lit.cfg
index 0943507..156c1f9 100644
--- a/polly/test/lit.cfg
+++ b/polly/test/lit.cfg
@@ -19,8 +19,15 @@ config.name = 'Polly'
#
# For now we require '&&' between commands, until they get globally killed and
# the test runner updated.
-execute_external = platform.system() != 'Windows'
-config.test_format = lit.formats.ShTest(execute_external)
+#
+# We prefer the lit internal shell which provides a better user experience on failures
+# unless the user explicitly disables it with LIT_USE_INTERNAL_SHELL=0 env var.
+use_lit_shell = True
+lit_shell_env = os.environ.get("LIT_USE_INTERNAL_SHELL")
+if lit_shell_env:
+ use_lit_shell = not lit.util.pythonize_bool(lit_shell_env)
+
+config.test_format = lit.formats.ShTest(execute_external=not use_lit_shell)
# suffixes: A list of file extensions to treat as test files.
config.suffixes = ['.ll']