Make it possible to run `cargo test` for bootstrap #95253

jyn514 · 2022-03-23T23:24:23Z

Note that this only runs bootstrap's self-tests, not compiler or library tests.

Helps with #94829.

rust-highfive · 2022-03-23T23:24:26Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

src/bootstrap/builder/tests.rs

Mark-Simulacrum · 2022-04-06T14:02:02Z

src/bootstrap/builder/tests.rs

- config.out = PathBuf::from(env::var_os("BOOTSTRAP_OUTPUT_DIRECTORY").unwrap());
- config.initial_rustc = PathBuf::from(env::var_os("RUSTC").unwrap());
- config.initial_cargo = PathBuf::from(env::var_os("BOOTSTRAP_INITIAL_CARGO").unwrap());
+ config.out = PathBuf::from(env!("OUT_DIR"));


Huh. I'm surprised this is the same behavior-wise:

If the package has a build script, this is set to the folder where the build script should place its output. See below for more information. (Only set during compilation.)

That doesn't really seem like what we want? Or at least, it seems a little weird.

ah, good point, cargo will probably cache these temporary files indefinitely. One alternative is to just use the out determined by Config::parse? But unfortunately cargo runs these tests with a working directory of src/bootstrap, so it will use src/bootstrap/build instead of the top-level build file :( you mentioned in another PR adding tempdir seems overkill, so I think OUT_DIR is probably an OK alternative? at least, it shouldn't hurt anything, nothing else in bootstrap reads from OUT_DIR.

Mark-Simulacrum · 2022-04-06T14:05:48Z

I'm interested in hearing what the next steps for cargo test are. Are you intending to add support for anything other than bootstrap itself to get run via cargo test? (It seems possible though somewhat annoying).

jyn514 · 2022-04-09T16:16:19Z

Are you intending to add support for anything other than bootstrap itself to get run via cargo test? (It seems possible though somewhat annoying).

Ooh, this is an excellent idea :D I think it wouldn't be too terrible to do if we added an integration test in src/bootstrap/tests that calls builder.ensure(test::X) for all X in test.rs :) I'll open an issue for that - not super high on my priority list, but definitely seems worth doing.

Note that this only runs bootstrap's self-tests, not compiler or library tests.

jyn514 · 2022-04-09T16:42:04Z

@rustbot ready

Mark-Simulacrum · 2022-04-10T00:12:55Z

@bors r+

bors · 2022-04-10T00:12:57Z

📌 Commit a0de44f has been approved by Mark-Simulacrum

bors · 2022-04-10T02:36:41Z

⌛ Testing commit a0de44f with merge 693dcc53bd2ca16987fd5b93582444b0ff33534b...

bors · 2022-04-10T03:18:28Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-04-10T03:44:53Z

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

Click to see the possible cause of the failure (guessed by this bot)

Some tests failed in compiletest suite=ui-fulldeps mode=ui host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc

error: test run failed!
status: exit code: 101
command: PATH="D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0-bootstrap-tools\x86_64-pc-windows-msvc\release\deps;D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw64\bin;C:\hostedtoolcache\windows\Python\3.10.4\x64\Scripts;C:\hostedtoolcache\windows\Python\3.10.4\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.7.5\x64;C:\cabal\bin;C:\ghcup\bin;C:\tools\ghc-9.2.2\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.1.3\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.15.15\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.322-6\x64\bin;C:\npm\prefix;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;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\nodejs;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.5\bin;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:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\ui-fulldeps\\stdio-from\\a.exe"
stdout: none
--- stderr -------------------------------
I/O error: operation failed to complete synchronously
thread 'main' panicked at 'assertion failed: child2.wait()?.success()', D:\a\rust\rust\src/test\ui-fulldeps\stdio-from.rs:50:5
------------------------------------------




failures:
    [ui] src/test\ui-fulldeps\stdio-from.rs

test result: FAILED. 65 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out; finished in 26.21s

Build completed unsuccessfully in 0:35:54
make: *** [Makefile:72: ci-subset-1] Error 1

Mark-Simulacrum · 2022-04-10T12:27:55Z

@bors retry stdio-from I/O error: operation failed to complete synchronously msvc

bors · 2022-04-10T12:30:28Z

⌛ Testing commit a0de44f with merge 32c2630...

bors · 2022-04-10T14:47:11Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 32c2630 to master...

rust-timer · 2022-04-10T16:28:00Z

Finished benchmarking commit (32c2630): comparison url.

Summary:

Primary benchmarks: no relevant changes found
Secondary benchmarks: 🎉 relevant improvements found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	0	0	6	0
mean²	N/A	N/A	N/A	-0.4%	N/A
max	N/A	N/A	N/A	-0.4%	N/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

number of relevant changes ↩
the arithmetic mean of the percent change ↩

rust-highfive assigned Mark-Simulacrum Mar 23, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2022

jyn514 force-pushed the cargo-run branch from 9bde70c to f30936d Compare March 23, 2022 23:25

jyn514 mentioned this pull request Mar 24, 2022

Tracking Issue for removing python as the main bootstrap entry point #94829

Open

15 tasks

Mark-Simulacrum reviewed Apr 6, 2022

View reviewed changes

src/bootstrap/builder/tests.rs Outdated Show resolved Hide resolved

Mark-Simulacrum reviewed Apr 6, 2022

View reviewed changes

Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2022

jyn514 mentioned this pull request Apr 9, 2022

Make it possible to use cargo test, not just x.py test #95854

Closed

Make it possible to run cargo test for bootstrap

a0de44f

Note that this only runs bootstrap's self-tests, not compiler or library tests.

jyn514 force-pushed the cargo-run branch from f30936d to a0de44f Compare April 9, 2022 16:41

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 9, 2022

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 Apr 10, 2022

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 Apr 10, 2022

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 Apr 10, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2022

bors merged commit 32c2630 into rust-lang:master Apr 10, 2022

rustbot added this to the 1.62.0 milestone Apr 10, 2022

bors mentioned this pull request Apr 10, 2022

unify bootstrap and shim binaries #95164

Closed

jyn514 deleted the cargo-run branch April 10, 2022 16:33

Mark-Simulacrum mentioned this pull request Apr 12, 2022

Remove ptr-int transmute in std::sync::mpsc #95621

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make it possible to run `cargo test` for bootstrap #95253

Make it possible to run `cargo test` for bootstrap #95253

jyn514 commented Mar 23, 2022

rust-highfive commented Mar 23, 2022

Mark-Simulacrum Apr 6, 2022

jyn514 Apr 9, 2022

Mark-Simulacrum commented Apr 6, 2022

jyn514 commented Apr 9, 2022

jyn514 commented Apr 9, 2022

Mark-Simulacrum commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

rust-log-analyzer commented Apr 10, 2022

Mark-Simulacrum commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

rust-timer commented Apr 10, 2022

Make it possible to run cargo test for bootstrap #95253

Make it possible to run cargo test for bootstrap #95253

Conversation

jyn514 commented Mar 23, 2022

rust-highfive commented Mar 23, 2022

Mark-Simulacrum Apr 6, 2022

Choose a reason for hiding this comment

jyn514 Apr 9, 2022

Choose a reason for hiding this comment

Mark-Simulacrum commented Apr 6, 2022

jyn514 commented Apr 9, 2022

jyn514 commented Apr 9, 2022

Mark-Simulacrum commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

rust-log-analyzer commented Apr 10, 2022

Mark-Simulacrum commented Apr 10, 2022

bors commented Apr 10, 2022

bors commented Apr 10, 2022

rust-timer commented Apr 10, 2022

Footnotes

Make it possible to run `cargo test` for bootstrap #95253

Make it possible to run `cargo test` for bootstrap #95253