Skip to content

[LLDB] Make internal shell the default for running LLDB lit tests. #156729

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
merged 3 commits into from
Sep 3, 2025
Merged

[LLDB] Make internal shell the default for running LLDB lit tests. #156729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9edcaf1
[LLDB] Make internal shell the default for running LLDB lit tests.
cmtice Sep 3, 2025
448eed7
Move the change to test/Shell subdirctory & update to not set
cmtice Sep 3, 2025
a645c9a
Really remove the old change this time.
cmtice Sep 3, 2025
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
2 changes: 1 addition & 1 deletion lldb/test/Shell/Process/Optimization.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Test warnings.
REQUIRES: shell, system-darwin
REQUIRES: system-darwin
RUN: %clang_host -O3 %S/Inputs/true.c -std=c99 -g -o %t.exe
RUN: %lldb -o "b main" -o r -o q -b %t.exe 2>&1 | FileCheck %s

Expand Down
2 changes: 0 additions & 2 deletions lldb/test/Shell/Process/UnsupportedLanguage.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Test unsupported language warning

REQUIRES: shell

RUN: %clang_host %S/Inputs/true.c -std=c99 -g -c -S -emit-llvm -o - \
RUN: | sed -e 's/DW_LANG_C99/DW_LANG_Mips_Assembler/g' >%t.ll
RUN: %clang_host %t.ll -g -o %t.exe
Expand Down
4 changes: 2 additions & 2 deletions lldb/test/Shell/SymbolFile/DWARF/dwo-missing-error.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
# "a.out-dwo-missing-error.dwo".
# RUN: rm -rf %t.compdir/
# RUN: mkdir -p %t.compdir/a/b/
# RUN: cd %t.compdir/a/b/
# RUN: pushd %t.compdir/a/b/
# RUN: %clang_host %S/Inputs/dwo-missing-error.c -glldb -gdwarf-5 \
# RUN: -gsplit-dwarf -fdebug-prefix-map=%t.compdir=. -o a.out
# RUN: rm *.dwo
# RUN: %lldb a.out -s %s -o exit 2>&1 | FileCheck %s
# RUN: cd -
# RUN: popd

# Test the error message with an absolute DW_AT_comp_dir and DW_AT_dwo_name.
# RUN: rm -rf %t.compdir/
Expand Down
12 changes: 12 additions & 0 deletions lldb/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@
config.name = "lldb"
config.test_source_root = os.path.dirname(__file__)
config.test_exec_root = os.path.join(config.lldb_obj_root, "test")

# We prefer the lit internal shell which provides a better user experience on
# failures and is faster 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 = lit.util.pythonize_bool(lit_shell_env)

if use_lit_shell:
os.environ["LIT_USE_INTERNAL_SHELL"] = "1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking we can avoid setting the env variable if we set config.test_format to
config.test_format = lit.formats.ShTest(execute_external=not use_lit_shell) like in the other tests. I'm assuming that's already the default, but not sure.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that originally, but for some reason the LLDB lit tests ignored that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like that's because all of the shell tests override it in lldb/test/Shell/lit.cfg.py. I think you want to make this modification there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Loading