Skip to content

Fix MinGW run-make-fulldeps tests #74009

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

Jump to bottom
Merged
merged 4 commits into from
Jul 18, 2020
Merged

Fix MinGW run-make-fulldeps tests #74009

merged 4 commits into from
Jul 18, 2020

Conversation

@mati865
Copy link
Member

@mati865 mati865 commented Jul 3, 2020

compiler-rt-works-on-mingw and libs-search-path were not ran because only-mingw doesn't match any target.
Enabled and verified few ignored tests with windows-gnu toolchain. They are still ignored on MSVC since I'm not experienced with this target.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2020
@mati865 mati865 mentioned this pull request Jul 3, 2020
Merged
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 16, 2020

📌 Commit 17bc07d has been approved by nikomatsakis

@bors bors 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 16, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
@Manishearth
Rollup merge of rust-lang#74009 - mati865:mingw-tests-implib, r=nikom…
fd2bec1 
…atsakis

Fix MinGW `run-make-fulldeps` tests

`compiler-rt-works-on-mingw` and `libs-search-path` were not ran because `only-mingw` doesn't match any target.
Enabled and verified few ignored tests with `windows-gnu` toolchain. They are still ignored on MSVC since I'm not experienced with this target.
@Manishearth Manishearth mentioned this pull request Jul 16, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
@Manishearth
Rollup merge of rust-lang#74009 - mati865:mingw-tests-implib, r=nikom…
fb08613 
…atsakis

Fix MinGW `run-make-fulldeps` tests

`compiler-rt-works-on-mingw` and `libs-search-path` were not ran because `only-mingw` doesn't match any target.
Enabled and verified few ignored tests with `windows-gnu` toolchain. They are still ignored on MSVC since I'm not experienced with this target.
@Manishearth Manishearth mentioned this pull request Jul 16, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
@Manishearth
Rollup merge of rust-lang#74009 - mati865:mingw-tests-implib, r=nikom…
9d59c05 
…atsakis

Fix MinGW `run-make-fulldeps` tests

`compiler-rt-works-on-mingw` and `libs-search-path` were not ran because `only-mingw` doesn't match any target.
Enabled and verified few ignored tests with `windows-gnu` toolchain. They are still ignored on MSVC since I'm not experienced with this target.
@Manishearth Manishearth mentioned this pull request Jul 16, 2020
Closed
@jyn514
Copy link
Member

jyn514 commented Jul 17, 2020

This failed on x86_64-pc-windows-gnu: #74415 (comment)

@Manishearth
Copy link
Member

@bors r-

@bors bors 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 17, 2020
mati865 added 4 commits July 17, 2020 18:07
@mati865
Create implib for dlls when testing MinGW targets
48fe5fc
@mati865
Allow matching test by target and env
2a9b51d
@mati865
Remove invalid test
933a06d 
When ran on Windows `cp` will follow symlink: `checkout/build/<target>/<stage>/lib/rustlib/src/rust`.
It points to `checkout` which means the test will get stuck in copying loop until there is no space left.
@mati865
Fix various tests to run on windows-gnu
af1d01e
@mati865 mati865 force-pushed the mingw-tests-implib branch from 17bc07d to af1d01e Compare July 17, 2020 18:45
@mati865
Copy link
Member Author

mati865 commented Jul 17, 2020

I apologize for that.
Made last second tweak to the test and typed _imp__ instead of __imp_ 🤦‍♂️

Tests pass again:

Check compiletest suite=run-make-fulldeps mode=run-make (x86_64-pc-windows-gnu -> x86_64-pc-windows-gnu)

running 212 tests
...i........ii..i.i...i....................ii...i.............i.i..............ii.....i............. 100/212
.......i..................iiiiii......ii..i.i....i.i..iii.....................iii.i................. 200/212
............
test result: ok. 178 passed; 0 failed; 34 ignored; 0 measured; 0 filtered out

        finished in 60.116

@Manishearth
Copy link
Member

@bors r=nikomatsakis rollup=iffy

@bors
Copy link
Collaborator

bors commented Jul 17, 2020

📌 Commit af1d01e has been approved by nikomatsakis

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 17, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 17, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 17, 2020
@Manishearth
Rollup merge of rust-lang#74009 - mati865:mingw-tests-implib, r=nikom…
db3e572 
…atsakis

Fix MinGW `run-make-fulldeps` tests

`compiler-rt-works-on-mingw` and `libs-search-path` were not ran because `only-mingw` doesn't match any target.
Enabled and verified few ignored tests with `windows-gnu` toolchain. They are still ignored on MSVC since I'm not experienced with this target.
@Manishearth Manishearth mentioned this pull request Jul 17, 2020
Closed
@Manishearth Manishearth mentioned this pull request Jul 17, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 17, 2020
@bors
Auto merge of rust-lang#74461 - Manishearth:rollup-xadbh00, r=Manishe…
d3df851 
…arth

Rollup of 18 pull requests

Successful merges:

 - rust-lang#71670 (Enforce even more the code blocks attributes check through rustdoc)
 - rust-lang#73930 (Make some Option methods const)
 - rust-lang#74009 (Fix MinGW `run-make-fulldeps` tests)
 - rust-lang#74056 (Add Arguments::as_str().)
 - rust-lang#74169 (Stop processing unreachable blocks when solving dataflow)
 - rust-lang#74251 (Teach bootstrap about target files vs target triples)
 - rust-lang#74288 (Fix src/test/run-make/static-pie/test-aslr.rs)
 - rust-lang#74300 (Use intra-doc links in core::iter module)
 - rust-lang#74364 (add lazy normalization regression tests)
 - rust-lang#74368 (Add CSS tidy check)
 - rust-lang#74394 (Remove leftover from emscripten fastcomp support)
 - rust-lang#74411 (Don't assign `()` to `!` MIR locals)
 - rust-lang#74416 (Use an UTF-8 locale for the linker.)
 - rust-lang#74424 (Move hir::Place to librustc_middle/hir)
 - rust-lang#74428 (docs: better demonstrate that None values are skipped as many times a…)
 - rust-lang#74438 (warn about uninitialized multi-variant enums)
 - rust-lang#74440 (Fix Arc::as_ptr docs)
 - rust-lang#74452 (intra-doc links: resolve modules in the type namespace)

Failed merges:

r? @ghost
@bors bors merged commit be3b972 into rust-lang:master Jul 18, 2020
@mati865 mati865 deleted the mingw-tests-implib branch July 24, 2020 07:33
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakis nikomatsakis

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

7 participants

@mati865 @rust-highfive @nikomatsakis @bors @jyn514 @Manishearth @cuviper