Skip to content
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.

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

Migrate use-suggestions-rust-2018, overwrite-input, lto-dylib-dep and many-crates-but-no-match run-make tests to rmake #127000

Merged
merged 4 commits into from
Jun 28, 2024

Conversation

Oneirical
Copy link
Contributor

Part of #121876 and the associated Google Summer of Code project.

@rustbot
Copy link
Collaborator

rustbot commented Jun 26, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 26, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 26, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Since this already contains 5 tests, I'd move the UI test port to a different PR, and we can try to merge this one without msvc-opt-minsize.

@Oneirical
Copy link
Contributor Author

Looks good! Since this already contains 5 tests, I'd move the UI test port to a different PR, and we can try to merge this one without msvc-opt-minsize.

I just dropped it from this PR.

@Oneirical Oneirical changed the title Migrate use-suggestions-rust-2018, overwrite-input, lto-dylib-dep, msvc-opt-minsize and many-crates-but-no-match run-make tests to rmake Migrate use-suggestions-rust-2018, overwrite-input, lto-dylib-dep and many-crates-but-no-match run-make tests to rmake Jun 27, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

Okay, here goes nothing.

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jun 27, 2024

📌 Commit b94eae5 has been approved by Kobzol

It is now in the queue for this repository.

@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 Jun 27, 2024
@bors
Copy link
Contributor

bors commented Jun 27, 2024

⌛ Testing commit b94eae5 with merge 3cf2d7b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2024
…Kobzol

Migrate `use-suggestions-rust-2018`, `overwrite-input`, `lto-dylib-dep` and `many-crates-but-no-match` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    
    ---- abi.md - Application_Binary_Interface__ABI_::The_ (line 20) stdout ----
    error: linking with `link.exe` failed: exit code: 1120
      |
      = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\bin\\HostX64\\x64\\link.exe" "/NOLOGO" "C:\\a\\_temp\\msys64\\tmp\\rustc8JxF6V\\symbols.o" "C:\\a\\_temp\\msys64\\tmp\\rustdoctestPoDwsP\\rust_out.rust_out.48f9219e7d77ab33-cgu.0.rcgu.o" "C:\\a\\_temp\\msys64\\tmp\\rustdoctestPoDwsP\\rust_out.4jvgok7rrgkecs4bc1vv2taem.rcgu.o" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libstd-206083cb6bc4d475.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libpanic_unwind-99645fe50ce44166.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\librustc_demangle-61b4562231042fd0.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libstd_detect-81cfc1256b6fbf6e.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libhashbrown-32b5e8b3646f8f41.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\librustc_std_workspace_alloc-eff6e1d33fba116e.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libunwind-90643aa787b02322.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libcfg_if-c83f178b1eb06b75.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\liballoc-49b3a906698dafaf.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\librustc_std_workspace_core-ced70f8369d90b15.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libcore-e4d31ad4edfac595.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libcompiler_builtins-b05085058f881bfe.rlib" "kernel32.lib" "advapi32.lib" "kernel32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "kernel32.lib" "ws2_32.lib" "kernel32.lib" "/defaultlib:msvcrt" "/NXCOMPAT" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "/OUT:C:\\a\\_temp\\msys64\\tmp\\rustdoctestPoDwsP\\rust_out.exe" "/OPT:REF,NOICF" "/DEBUG" "/PDBALTPATH:%_PDB%"
      = note: symbols.o : error LNK2001: unresolved external symbol _ZN8rust_out4main25_doctest_main_abi_md_20_03FOO17h80b974628f045d59E
              C:\a\_temp\msys64\tmp\rustdoctestPoDwsP\rust_out.exe : fatal error LNK1120: 1 unresolved externals
    
    error: aborting due to 1 previous error
    
    Couldn't compile the test.
---
[RUSTC-TIMING] miri test:false 64.079
[RUSTC-TIMING] miri test:false 3.046
    Finished `release` profile [optimized] target(s) in 0.41s
thread 'main' panicked at src/lib.rs:1713:17:
failed to copy `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe` to `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools-bin\miri.exe`: The process cannot access the file because it is being used by another process. (os error 32)
##[endgroup]
Build completed unsuccessfully in 0:00:10
  local time: Fri, Jun 28, 2024  1:08:22 AM
  network time: Fri, 28 Jun 2024 01:08:22 GMT

@bors
Copy link
Contributor

bors commented Jun 28, 2024

💔 Test failed - checks-actions

@bors bors 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 Jun 28, 2024
@matthiaskrgr
Copy link
Member

@bors retry ?

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2024
@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 Jun 28, 2024
@bors
Copy link
Contributor

bors commented Jun 28, 2024

⌛ Testing commit b94eae5 with merge c4c0897...

@bors
Copy link
Contributor

bors commented Jun 28, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing c4c0897 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2024
@bors bors merged commit c4c0897 into rust-lang:master Jun 28, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 28, 2024
@Oneirical Oneirical deleted the no-test-for-the-wicked branch June 28, 2024 19:54
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c4c0897): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -2.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.0% [-2.0%, -2.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.0% [-2.0%, -2.0%] 1

Cycles

Results (secondary -2.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 696.308s -> 696.756s (0.06%)
Artifact size: 326.72 MiB -> 326.69 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

8 participants