Skip to content

Commit 9535bd7

Browse files
committed
Enable LLDB debug info tests on CI
1 parent 105354d commit 9535bd7

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
cmake \
1717
sudo \
1818
gdb \
19+
lldb-19 \
1920
llvm-19-tools \
2021
llvm-19-dev \
2122
libedit-dev \
@@ -52,6 +53,7 @@ ENV RUST_CONFIGURE_ARGS \
5253
--build=x86_64-unknown-linux-gnu \
5354
--llvm-root=/usr/lib/llvm-19 \
5455
--enable-llvm-link-shared \
56+
--set build.lldb=lldb-19 \
5557
--set rust.randomize-layout=true \
5658
--set rust.thin-lto-import-instr-limit=10
5759

src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
cmake \
1717
sudo \
1818
gdb \
19+
lldb-20 \
1920
llvm-20-tools \
2021
llvm-20-dev \
2122
libedit-dev \
@@ -52,6 +53,7 @@ ENV RUST_CONFIGURE_ARGS \
5253
--build=x86_64-unknown-linux-gnu \
5354
--llvm-root=/usr/lib/llvm-20 \
5455
--enable-llvm-link-shared \
56+
--set build.lldb=lldb-20 \
5557
--set rust.randomize-layout=true \
5658
--set rust.thin-lto-import-instr-limit=10
5759

src/tools/compiletest/src/runtest/debuginfo.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,16 @@ impl TestCx<'_> {
448448
} else {
449449
self.config.lldb_python_dir.clone().unwrap()
450450
};
451+
452+
// DEBUGGING.
453+
_ = pythonpath;
454+
451455
self.run_command_to_procres(
452456
Command::new(&self.config.python)
453457
.arg(&lldb_script_path)
454458
.arg(test_executable)
455459
.arg(debugger_script)
456-
.env("PYTHONUNBUFFERED", "1") // Help debugging #78665
457-
.env("PYTHONPATH", pythonpath),
460+
.env("PYTHONUNBUFFERED", "1"), // Help debugging #78665
458461
)
459462
}
460463

0 commit comments

Comments
 (0)