llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb @llvm/pr-subscribers-libcxx Author: Michael Buch (Michael137) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/113891.diff 2 Files Affected: - (modified) .github/workflows/libcxx-build-and-test.yaml (+11-8) - (modified) lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py (+1-2) ``````````diff diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml index 184fed2268e818..3521b5d5a3def4 100644 --- a/.github/workflows/libcxx-build-and-test.yaml +++ b/.github/workflows/libcxx-build-and-test.yaml @@ -49,7 +49,8 @@ env: jobs: stage1: if: github.repository_owner == 'llvm' - runs-on: libcxx-runners-8-set + runs-on: libcxx-runners-set + container: ghcr.io/libcxx/actions-builder:testing-2024-09-21 continue-on-error: false strategy: fail-fast: false @@ -84,7 +85,8 @@ jobs: **/crash_diagnostics/* stage2: if: github.repository_owner == 'llvm' - runs-on: libcxx-runners-8-set + runs-on: libcxx-runners-set + container: ghcr.io/libcxx/actions-builder:testing-2024-09-21 needs: [ stage1 ] continue-on-error: false strategy: @@ -160,20 +162,21 @@ jobs: 'benchmarks', 'bootstrapping-build' ] - machine: [ 'libcxx-runners-8-set' ] + machine: [ 'libcxx-runners-set' ] include: - config: 'generic-cxx26' - machine: libcxx-runners-8-set + machine: libcxx-runners-set - config: 'generic-asan' - machine: libcxx-runners-8-set + machine: libcxx-runners-set - config: 'generic-tsan' - machine: libcxx-runners-8-set + machine: libcxx-runners-set - config: 'generic-ubsan' - machine: libcxx-runners-8-set + machine: libcxx-runners-set # Use a larger machine for MSAN to avoid timeout and memory allocation issues. - config: 'generic-msan' - machine: libcxx-runners-8-set + machine: libcxx-runners-set runs-on: ${{ matrix.machine }} + container: ghcr.io/libcxx/actions-builder:testing-2024-09-21 steps: - uses: actions/checkout@v4 - name: ${{ matrix.config }} diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py index 63748a71f1122d..c29992ce9c7848 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py @@ -793,8 +793,6 @@ def request_launch( args_dict["env"] = env if stopOnEntry: args_dict["stopOnEntry"] = stopOnEntry - if disableASLR: - args_dict["disableASLR"] = disableASLR if disableSTDIO: args_dict["disableSTDIO"] = disableSTDIO if shellExpandArguments: @@ -829,6 +827,7 @@ def request_launch( if customThreadFormat: args_dict["customThreadFormat"] = customThreadFormat + args_dict["disableASLR"] = disableASLR args_dict["enableAutoVariableSummaries"] = enableAutoVariableSummaries args_dict["enableSyntheticChildDebugging"] = enableSyntheticChildDebugging args_dict["displayExtendedBacktrace"] = displayExtendedBacktrace `````````` </details> https://github.com/llvm/llvm-project/pull/113891 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
