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

test: Migrate jobserver to snapbox #14191

Merged
merged 2 commits into from
Jul 5, 2024

Conversation

dieterplex
Copy link
Contributor

Part of #14039.

@rustbot
Copy link
Collaborator

rustbot commented Jul 4, 2024

r? @weihanglo

rustbot has assigned @weihanglo.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 4, 2024
@dieterplex dieterplex force-pushed the migrate-jobserver-snapbox branch 3 times, most recently from b633f5c to 47fedac Compare July 5, 2024 01:19
tests/testsuite/jobserver.rs Outdated Show resolved Hide resolved
@dieterplex dieterplex force-pushed the migrate-jobserver-snapbox branch from 47fedac to 82477d8 Compare July 5, 2024 04:28
Comment on lines 229 to 237
.with_stderr_data(str![[r#"
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] `target/debug/cargo-jobserver-check[EXE]`
thread 'main' panicked at src/main.rs:5:43:
no jobserver from env: NotPresent
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace

"#]])
Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/rust-lang/cargo/actions/runs/9803086601/job/27068710146#step:11:4061

 running `D:\a\cargo\cargo\target\debug\cargo.exe run -j2`
thread 'jobserver::runner_inherits_jobserver' panicked at tests\testsuite\jobserver.rs:237:10:

---- expected: tests\testsuite\jobserver.rs:229:27
++++ actual:   stderr
   1    1 | [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
   2    2 | [RUNNING] `target/debug/cargo-jobserver-check[EXE]`
   3    3 | thread 'main' panicked at src/main.rs:5:43:
   4    4 | no jobserver from env: NotPresent
   5    5 | [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
        6 + [ERROR] process didn't exit successfully: `target/debug/cargo-jobserver-check[EXE]` ([EXIT_STATUS]: 101)

I don't get it why it got passed with or without the error line at local win host, but fails at CI env.

@dieterplex dieterplex force-pushed the migrate-jobserver-snapbox branch 2 times, most recently from 8571b21 to b336242 Compare July 5, 2024 06:23
thread 'main' panicked at src/main.rs:6:17:
assertion failed: status.success()
[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
...
Copy link
Contributor Author

Choose a reason for hiding this comment

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

globbing the error line.

https://github.com/rust-lang/cargo/actions/runs/9803335785/job/27069355328#step:11:4063

 running `D:\a\cargo\cargo\target\debug\cargo.exe run -j2 --config 'target.x86_64-pc-windows-msvc.runner = "runner"'`
thread 'jobserver::runner_inherits_jobserver' panicked at tests\testsuite\jobserver.rs:256:10:
---- expected: tests\testsuite\jobserver.rs:244:27
++++ actual:   stderr
   1    1 | [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
   2    2 | [RUNNING] `runner target/debug/cargo-jobserver-check[EXE]`
   3    3 | this is a runner
   4    4 | thread 'main' panicked at src/main.rs:5:43:
   5    5 | no jobserver from env: NotPresent
   6    6 | [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
   7    7 | thread 'main' panicked at src/main.rs:6:17:
   8    8 | assertion failed: status.success()
   9    9 | [NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
       10 + [ERROR] process didn't exit successfully: `runner target/debug/cargo-jobserver-check[EXE]` ([EXIT_STATUS]: 101)

@dieterplex dieterplex force-pushed the migrate-jobserver-snapbox branch from b336242 to 3c17ca0 Compare July 5, 2024 15:44
This is a follow up to 14646e6 and it would fix warnings while migrating
jobserver tests to snapbox.

see [feat(toml): Warn on unset Edition rust-lang#13505](rust-lang#13505)
@dieterplex dieterplex force-pushed the migrate-jobserver-snapbox branch from 3c17ca0 to 58fce87 Compare July 5, 2024 16:01
@epage
Copy link
Contributor

epage commented Jul 5, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit 58fce87 has been approved by epage

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 Jul 5, 2024
@bors
Copy link
Contributor

bors commented Jul 5, 2024

⌛ Testing commit 58fce87 with merge f86ce56...

@bors
Copy link
Contributor

bors commented Jul 5, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing f86ce56 to master...

@bors bors merged commit f86ce56 into rust-lang:master Jul 5, 2024
22 checks passed
@dieterplex dieterplex deleted the migrate-jobserver-snapbox branch July 5, 2024 18:57
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
Update cargo

13 commits in a515d463427b3912ec0365d106791f88c1c14e1b..f86ce56396168edf5d0e1c412ddda0b2edba7d46
2024-07-02 20:53:36 +0000 to 2024-07-05 17:52:05 +0000
- test: Migrate jobserver to snapbox (rust-lang/cargo#14191)
- chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186)
- test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193)
- test: migrate cfg and check to snapbox (rust-lang/cargo#14185)
- test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170)
- Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900)
- test: Migrate network tests to snapbox (rust-lang/cargo#14187)
- test: migrate some files to snapbox (rust-lang/cargo#14113)
- test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161)
- chore: fix some typos (rust-lang/cargo#14182)
- fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026)
- test:migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171)
- test: Migrate git_auth to snapbox (rust-lang/cargo#14172)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 7, 2024
Update cargo

20 commits in a515d463427b3912ec0365d106791f88c1c14e1b..154fdac39ae9629954e19e9986fd2cf2cdd8d964
2024-07-02 20:53:36 +0000 to 2024-07-07 01:28:23 +0000
- test: relax redactions for rust-lang/rust (rust-lang/cargo#14203)
- use "bootstrap" instead of "rustbuild" (rust-lang/cargo#14207)
- test: migrate serveral files to snapbox (rust-lang/cargo#14180)
- Add rustdocflags to Unit's Debug impl (rust-lang/cargo#14201)
- Allow enabling `config-include` feature in config (rust-lang/cargo#14196)
- fix(test): Restore `does_not_contain` for check (rust-lang/cargo#14198)
- test: migrate patch, pkgid, proc_macro and progress to snapbox (rust-lang/cargo#14181)
- test: Migrate jobserver to snapbox (rust-lang/cargo#14191)
- chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186)
- test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193)
- test: migrate cfg and check to snapbox (rust-lang/cargo#14185)
- test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170)
- Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900)
- test: Migrate network tests to snapbox (rust-lang/cargo#14187)
- test: migrate some files to snapbox (rust-lang/cargo#14113)
- test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161)
- chore: fix some typos (rust-lang/cargo#14182)
- fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026)
- test:migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171)
- test: Migrate git_auth to snapbox (rust-lang/cargo#14172)
@rustbot rustbot added this to the 1.81.0 milestone Jul 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

5 participants