Skip to content

Attempt to fix backtrace tests on i686-msvc - #62897

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-i686-msvc-tests
Jul 31, 2019
Merged

Attempt to fix backtrace tests on i686-msvc#62897
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-i686-msvc-tests

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

Some fixes for i686-msvc and Windows have landed on the backtrace
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

Note that this isn't ready for merging yet since I'd like to see what CI comes back with

@alexcrichton

Copy link
Copy Markdown
MemberAuthor

Looks like tests were successful so this should be good to go!

r? @pietroalbini

@emilyalbini

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jul 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 61b680b has been approved by pietroalbini

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019
…=pietroalbini
Attempt to fix backtrace tests on i686-msvc
Some fixes for i686-msvc and Windows have landed on the `backtrace`
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.
@CentrilCentril mentioned this pull request Jul 24, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019
…=pietroalbini
Attempt to fix backtrace tests on i686-msvc
Some fixes for i686-msvc and Windows have landed on the `backtrace`
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.
@CentrilCentril mentioned this pull request Jul 25, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 26, 2019
…=pietroalbini
Attempt to fix backtrace tests on i686-msvc
Some fixes for i686-msvc and Windows have landed on the `backtrace`
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.
@CentrilCentril mentioned this pull request Jul 26, 2019
bors added a commit that referenced this pull request Jul 26, 2019
Rollup of 14 pull requests
Successful merges:
- #62084 (allow clippy::unreadable_literal in unicode tables)
- #62421 (Introduce `as_deref` to Option)
- #62692 (rustc: precompute the largest Niche and store it in LayoutDetails.)
- #62801 (Remove support for -Zlower-128bit-ops)
- #62828 (Remove vector fadd/fmul reduction workarounds)
- #62862 (code cleanup)
- #62897 (Attempt to fix backtrace tests on i686-msvc)
- #62904 (Disable d32 on armv6 hf targets)
- #62907 (Initialize the MSP430 AsmParser)
- #62956 (Implement slow-path for FirstSets::first)
- #62963 (Allow lexer to recover from some homoglyphs)
- #62970 (ci: gate toolstate repo pushes on the TOOLSTATE_PUBLISH envvar)
- #62983 (Remove needless indirection through Rc)
- #62985 (librustc_errors: Support ui-testing flag in annotate-snippet emitter)
Failed merges:
r? @ghost
@Centril

Copy link
Copy Markdown
Contributor

@bors r- Failed in #63001 (comment).

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 26, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

@bors: r=pietroalbini

I've ended up disabling the test here for i686-pc-windows-msvc. Some rationale is also in the comments in the commit, but the main tl;dr; is that this program:

fnmain(){panic!();}

will have a truncated stack trace effectively randomly when compiled against an i686-pc-windows-msvc standard library that does not have either frame pointers or debuginfo. Nightlies have debuginfo so I can never get a truncated stack trace, but the testing compiler on CI does not have debuginfo in libstd. I've debugged this all the way down to our calls to StackWalkEx and StackWalk64. Those are acting as expected and nothing looks out of place. Overall it seems like this may be a bug in Windows itself, although not that I'd have any idea as to where.

We otherwise are covered with this test in the backtrace-rs crate itself which ensures that it tests i686-pc-windows-msvc and this test works there. There we have more control over codegen since everything has frame pointers and debuginfo. In the end there's not a huge amount we can do here other than maybe turn frame pointers on by default for i686-pc-windows-msvc, but I don't think this is the location for that to happen.

@bors

bors commented Jul 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9d4e1669fc154733991b8f232b97572dff36aea1 has been approved by pietroalbini

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 26, 2019
@bors

bors commented Jul 27, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #63029) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2019
@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@rust-highfive

Copy link
Copy Markdown
Contributor

The job i686-msvc-2 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-07-29T14:50:20.3007452Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-29T14:50:20.3007600Z 2019-07-29T14:50:20.3007743Z git checkout -b <new-branch-name>
2019-07-29T14:50:20.3007863Z 2019-07-29T14:50:20.3008042Z HEAD is now at a385138fe Auto merge of #62897 - alexcrichton:fix-i686-msvc-tests, r=pietroalbini
2019-07-29T14:50:20.3401336Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-29T14:50:20.3511699Z ==============================================================================
2019-07-29T14:50:20.3511775Z Task : Bash
2019-07-29T14:50:20.3511848Z Description : Run a Bash script on macOS, Linux, or Windows
---
2019-07-29T14:55:57.8317243Z installing mingw-w64-i686-rhash...
2019-07-29T14:55:57.8923673Z installing mingw-w64-i686-cmake...
2019-07-29T14:56:06.3490311Z Optional dependencies for mingw-w64-i686-cmake
2019-07-29T14:56:06.3490577Z mingw-w64-i686-qt5: CMake Qt GUI
2019-07-29T14:56:06.3490680Z mingw-w64-i686-emacs: for cmake emacs mode
2019-07-29T14:56:12.9584117Z D:\a\1\s\citools\msys64\usr\bin\rev.exe
2019-07-29T14:56:13.3124735Z Usage: rev [options] [file ...]
2019-07-29T14:56:13.3124845Z 2019-07-29T14:56:13.3125069Z Reverse lines characterwise.
---
2019-07-29T17:39:48.5864404Z ---- [ui] ui\backtrace.rs stdout ----
2019-07-29T17:39:48.5864533Z 2019-07-29T17:39:48.5864677Z error: test run failed!
2019-07-29T17:39:48.5865005Z status: exit code: 101
2019-07-29T17:39:48.5866877Z command: PATH="D:\a\1\s\build\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;D:\a\1\s\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\1\s\build\i686-pc-windows-msvc\stage0\bin;D:\a\1\s\ninja;C:\Python27amd64;D:\a\1\s\citools\msys64\mingw32\bin;D:\a\1\s\citools\msys64\usr\bin;C:\Program Files (x86)\Inno Setup 5;D:\a\1\s\sccache;C:\agents\2.154.3\externals\git\cmd;C:\hostedtoolcache\windows\Python\3.6.8\x64;C:\hostedtoolcache\windows\Python\3.6.8\x64\Scripts;C:\Program Files\Mercurial;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\Program Files\Mercurial;C:\Program Files\Boost\1.69.0;C:\Users\VssAdministrator\.dotnet\tools;C:\Program Files\dotnet;C:\mysql-5.7.21-winx64\bin;C:\Program Files\Java\zulu-8-azure-jdk_8.38.0.13-8.0.212-win_x64\bin;C:\npm\prefix;C:\Rust\.cargo\bin;C:\hostedtoolcache\windows\Ruby\2.5.3\x64\bin;C:\Go1.12.4\bin;C:\Program Files\Git\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\bin;C:\hostedtoolcache\windows\Python\3.6.8\x64\Scripts;C:\hostedtoolcache\windows\Python\3.6.8\x64;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\Program Files\Microsoft MPI\Bin;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0;C:\ProgramData\Chocolatey\bin;C:\Program Files\Docker;C:\Program Files\PowerShell\6;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\Subversion\bin;C:\Program Files\nodejs;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.6.1\bin;C:\Program Files\CMake\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\OpenSSL\bin;C:\Users\VssAdministrator\AppData\Local\Microsoft\WindowsApps" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\backtrace\\a.exe"
2019-07-29T17:39:48.5868497Z ------------------------------------------
2019-07-29T17:39:48.5868618Z 2019-07-29T17:39:48.5868864Z ------------------------------------------
2019-07-29T17:39:48.5869049Z stderr:
2019-07-29T17:39:48.5869049Z stderr:
2019-07-29T17:39:48.5869174Z ------------------------------------------
2019-07-29T17:39:48.5869353Z thread 'main' panicked at 'bad output: thread 'main' panicked at 'explicit panic', D:\a\1\s\src/test\ui\backtrace.rs:17:9
2019-07-29T17:39:48.5869648Z 0: std::panicking::take_hook
2019-07-29T17:39:48.5869794Z 1: std::panicking::take_hook
2019-07-29T17:39:48.5869925Z 2: std::panicking::rust_panic_with_hook
2019-07-29T17:39:48.5869925Z 2: std::panicking::rust_panic_with_hook
2019-07-29T17:39:48.5870082Z ', D:\a\1\s\src/test\ui\backtrace.rs:67:5
2019-07-29T17:39:48.5870380Z 2019-07-29T17:39:48.5870514Z ------------------------------------------
2019-07-29T17:39:48.5870624Z 2019-07-29T17:39:48.5870740Z ---
2019-07-29T17:39:48.5899282Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:533:22
2019-07-29T17:39:48.5899430Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-07-29T17:39:48.5933201Z 2019-07-29T17:39:48.5933325Z 2019-07-29T17:39:48.5934006Z command did not execute successfully: "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\1\\s\\src/test\\ui" "--build-base" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui" "--stage-id" "stage2-i686-pc-windows-msvc" "--mode" "ui" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\Python27amd64\\python2.7" "--lldb-python" "C:\\Python27amd64\\python2.7" "--gdb" "D:\\a\\1\\s\\citools\\msys64\\mingw32\\bin\\gdb" "--llvm-version" "9.0.0-rust-1.38.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-07-29T17:39:48.5934968Z 2019-07-29T17:39:48.5935003Z 2019-07-29T17:39:48.6883391Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test src/test/ui src/test/compile-fail src/tools/linkchecker
2019-07-29T17:39:48.6883544Z Build completed unsuccessfully in 2:37:06
2019-07-29T17:39:48.6883544Z Build completed unsuccessfully in 2:37:06
2019-07-29T17:39:48.7219202Z make: *** [Makefile:82: ci-subset-2] Error 1
2019-07-29T17:39:49.2032126Z ##[error]Bash exited with code '2'.
2019-07-29T17:39:49.2562786Z ##[section]Starting: Upload CPU usage statistics
2019-07-29T17:39:49.3360476Z ==============================================================================
2019-07-29T17:39:49.3360584Z Task : Bash
2019-07-29T17:39:49.3360674Z Description : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 29, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

I've pushed a commit which ignores that test as well since it's failing for basically the same reasons.

@bors: r=pietroalbini

@bors

bors commented Jul 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit f16b0b6adf431c6306ce0767b9f3d2a02df72994 has been approved by pietroalbini

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

@bors: r=pietroalbini

@bors

bors commented Jul 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a025318ae75ec3863214099c6dd1eab90c074b42 has been approved by pietroalbini

Some fixes for i686-msvc and Windows have landed on the `backtrace`
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

I've updated the backtrace crate again to pull in rust-lang/backtrace-rs#231

@bors: r=pietroalbini

@bors

bors commented Jul 31, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3d2b6e7 has been approved by pietroalbini

@bors

bors commented Jul 31, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3d2b6e7 with merge 8a58268...

bors added a commit that referenced this pull request Jul 31, 2019
Attempt to fix backtrace tests on i686-msvc
Some fixes for i686-msvc and Windows have landed on the `backtrace`
crate but hadn't made their way here yet. Let's update that and see if
it passes CI.
@bors

bors commented Jul 31, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 8a58268 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 31, 2019
@bors
bors merged commit 3d2b6e7 into rust-lang:masterJul 31, 2019
@alexcrichton
alexcrichton deleted the fix-i686-msvc-tests branch August 24, 2019 22:09
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2024
Run `tests/ui/backtrace/std-backtrace.rs` on MSVC.
the original PR which disabled these, rust-lang#62897, only mentions them being broken on i686. let's still make sure the rest of windows is supported.
r? `@jieyouxu`
try-job: x86_64-msvc
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 25, 2024
Run `tests/ui/backtrace/std-backtrace.rs` on MSVC.
the original PR which disabled these, rust-lang#62897, only mentions them being broken on i686. let's still make sure the rest of windows is supported.
r? `@jieyouxu`
try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 25, 2024
Run `tests/ui/backtrace/std-backtrace.rs` on MSVC.
the original PR which disabled these, rust-lang#62897, only mentions them being broken on i686. let's still make sure the rest of windows is supported.
r? `@jieyouxu`
try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 25, 2024
Run `tests/ui/backtrace/std-backtrace.rs` on MSVC.
The original PR which disabled these, rust-lang#62897, only mentions them being broken on i686. ~~let's still make sure the rest of windows is supported.~~ Let's see if we can enable this for msvc now (32-bit and 64-bit).
r? `@jieyouxu`
try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@alexcrichton@rust-highfive@emilyalbini@bors@Centril@nikomatsakis