From 63eb6c3b9d30eb0f199daa18f38848ed2cbf86aa Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 4 Jul 2023 03:13:14 -0400 Subject: [PATCH 1/3] (do not merge) debuginfo test --- tests/debuginfo/rc_arc.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/debuginfo/rc_arc.rs b/tests/debuginfo/rc_arc.rs index 5d5492d721777..7dadd7c592cb7 100644 --- a/tests/debuginfo/rc_arc.rs +++ b/tests/debuginfo/rc_arc.rs @@ -9,7 +9,7 @@ // gdb-command:run // gdb-command:print rc -// gdb-check:[...]$1 = Rc(strong=11, weak=1) = {value = 111, strong = 11, weak = 1} +// gdb-check:[...]$1 = Rc(strong=11, weak=1) = {value = 111, FAIL strong = 11, weak = 1} // gdb-command:print arc // gdb-check:[...]$2 = Arc(strong=21, weak=1) = {value = 222, strong = 21, weak = 1} @@ -28,8 +28,8 @@ // cdb-command:dx rc,d // cdb-check:rc,d : 111 [Type: alloc::rc::Rc] -// cdb-check: [Reference count] : 11 [Type: core::cell::Cell] -// cdb-check: [Weak reference count] : 2 [Type: core::cell::Cell] +// cdb-check: [Reference count] : 11 [Type: core::cell FAIL ::Cell] +// cdb-check: [Weak reference count] : 2 [Type: core::cell FAIL::Cell] // cdb-command:dx weak_rc,d // cdb-check:weak_rc,d : 111 [Type: alloc::rc::Weak] @@ -38,7 +38,7 @@ // cdb-command:dx arc,d // cdb-check:arc,d : 222 [Type: alloc::sync::Arc] -// cdb-check: [Reference count] : 21 [Type: core::sync::atomic::AtomicUsize] +// cdb-check: [Reference count] : 21 [Type: core::sync::atomic FAIL::AtomicUsize] // cdb-check: [Weak reference count] : 2 [Type: core::sync::atomic::AtomicUsize] // cdb-command:dx weak_arc,d @@ -47,7 +47,7 @@ // cdb-check: [Weak reference count] : 2 [Type: core::sync::atomic::AtomicUsize] // cdb-command:dx dyn_rc,d -// cdb-check:dyn_rc,d [Type: alloc::rc::Rc >] +// cdb-check:dyn_rc,d [Type: alloc::rc::Rc >] // cdb-check: [Reference count] : 31 [Type: core::cell::Cell] // cdb-check: [Weak reference count] : 2 [Type: core::cell::Cell] From f3cd4eed3cce4c88d3a737eb1e82ac8ec66a5793 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 4 Jul 2023 03:19:16 -0400 Subject: [PATCH 2/3] Update wf to run --- .github/workflows/ci.yml | 5 +++++ tests/debuginfo/rc_arc.rs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff62e1ded61d0..44ec345ff3967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,11 @@ jobs: - name: x86_64-gnu-tools os: ubuntu-20.04-16core-64gb env: {} + - name: x86_64-msvc + env: + RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" + SCRIPT: make ci-msvc + os: windows-2019-8core-32gb timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/tests/debuginfo/rc_arc.rs b/tests/debuginfo/rc_arc.rs index 7dadd7c592cb7..6bc66e1e3f75c 100644 --- a/tests/debuginfo/rc_arc.rs +++ b/tests/debuginfo/rc_arc.rs @@ -9,7 +9,7 @@ // gdb-command:run // gdb-command:print rc -// gdb-check:[...]$1 = Rc(strong=11, weak=1) = {value = 111, FAIL strong = 11, weak = 1} +// gdb-check:[...]$1 = Rc(strong=11, weak=1) = {value = 111, strong = 11, weak = 1} // gdb-command:print arc // gdb-check:[...]$2 = Arc(strong=21, weak=1) = {value = 222, strong = 21, weak = 1} From 0beb9db039955854f4d57469ec60a65c4d83f0fb Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Tue, 4 Jul 2023 03:19:43 -0400 Subject: [PATCH 3/3] Update wf to run --- src/ci/github-actions/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index cb12042c11739..34d6de21b062f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -328,6 +328,12 @@ jobs: - name: x86_64-gnu-tools <<: *job-linux-16c + - name: x86_64-msvc + env: + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-msvc + <<: *job-windows-8c + auto: <<: *base-ci-job name: auto - ${{ matrix.name }}