Commit 6c3a86b

committed

Do not run lint-docs tests in stage 1 x test by default

1 parent 8e97112 commit 6c3a86bCopy full SHA for 6c3a86b

File tree

2 files changed

+11

-8

lines changed

src/bootstrap/src/core
- build_steps
  - test.rs
- builder
  - tests.rs

2 files changed

+11

-8

lines changed

`‎src/bootstrap/src/core/build_steps/test.rs`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1848,12 +1848,15 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the`
`1848`	`1848`	`let is_rustdoc = suite == "rustdoc-ui" \|\| suite == "rustdoc-js";`
`1849`	`1849`
`1850`	`1850`	`if mode == "run-make" {`
`1851`		`- let cargo_path = if builder.top_stage == 0 {`
	`1851`	`+ let cargo_path = if test_compiler.stage == 0 {`
`1852`	`1852`	// If we're using `--stage 0`, we should provide the bootstrap cargo.
`1853`	`1853`	`builder.initial_cargo.clone()`
`1854`	`1854`	`} else {`
`1855`	`1855`	`builder`
`1856`		`- .ensure(tool::Cargo::from_build_compiler(test_compiler, test_compiler.host))`
	`1856`	`+ .ensure(tool::Cargo::from_build_compiler(`
	`1857`	`+ builder.compiler(test_compiler.stage - 1, test_compiler.host),`
	`1858`	`+ test_compiler.host,`
	`1859`	`+ ))`
`1857`	`1860`	`.tool_path`
`1858`	`1861`	`};`
`1859`	`1862`
`@@ -1902,7 +1905,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the`
`1902`	`1905`
`1903`	`1906`	`// When top stage is 0, that means that we're testing an externally provided compiler.`
`1904`	`1907`	`// In that case we need to use its specific sysroot for tests to pass.`
`1905`		`- let sysroot = if builder.top_stage == 0 {`
	`1908`	`+ let sysroot = if test_compiler.stage == 0 {`
`1906`	`1909`	`builder.initial_sysroot.clone()`
`1907`	`1910`	`} else {`
`1908`	`1911`	`builder.sysroot(test_compiler)`

`‎src/bootstrap/src/core/builder/tests.rs`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2124,7 +2124,7 @@ mod snapshot {`
`2124`	`2124`	`[build] rustc 0 <host> -> HtmlChecker 1 <host>`
`2125`	`2125`	`[test] html-check <host>`
`2126`	`2126`	`[build] rustc 0 <host> -> RunMakeSupport 1 <host>`
`2127`		`- [build] rustc 1 <host> -> cargo 2 <host>`
	`2127`	`+ [build] rustc 0 <host> -> cargo 1 <host>`
`2128`	`2128`	`[test] compiletest-run-make 1 <host>`
`2129`	`2129`	`");`
`2130`	`2130`	`}`
`@@ -2143,7 +2143,7 @@ mod snapshot {`
`2143`	`2143`	`[test] compiletest-ui 1 <host>`
`2144`	`2144`	`[test] compiletest-ui-fulldeps 1 <host>`
`2145`	`2145`	`[build] rustc 0 <host> -> RunMakeSupport 1 <host>`
`2146`		`- [build] rustc 1 <host> -> cargo 2 <host>`
	`2146`	`+ [build] rustc 0 <host> -> cargo 1 <host>`
`2147`	`2147`	`[build] rustdoc 1 <host>`
`2148`	`2148`	`[test] compiletest-run-make 1 <host>`
`2149`	`2149`	`[test] compiletest-rustdoc 1 <host>`
`@@ -2172,7 +2172,7 @@ mod snapshot {`
`2172`	`2172`	`[build] rustc 2 <host> -> rustc 3 <host>`
`2173`	`2173`	`[test] compiletest-ui-fulldeps 2 <host>`
`2174`	`2174`	`[build] rustc 0 <host> -> RunMakeSupport 1 <host>`
`2175`		`- [build] rustc 2 <host> -> cargo 3 <host>`
	`2175`	`+ [build] rustc 1 <host> -> cargo 2 <host>`
`2176`	`2176`	`[build] rustdoc 2 <host>`
`2177`	`2177`	`[test] compiletest-run-make 2 <host>`
`2178`	`2178`	`[test] compiletest-rustdoc 2 <host>`
`@@ -2206,7 +2206,7 @@ mod snapshot {`
`2206`	`2206`	`[build] rustc 2 <host> -> rustc 3 <target1>`
`2207`	`2207`	`[test] compiletest-ui-fulldeps 2 <target1>`
`2208`	`2208`	`[build] rustc 0 <host> -> RunMakeSupport 1 <host>`
`2209`		`- [build] rustc 2 <host> -> cargo 3 <host>`
	`2209`	`+ [build] rustc 1 <host> -> cargo 2 <host>`
`2210`	`2210`	`[build] rustdoc 2 <host>`
`2211`	`2211`	`[test] compiletest-run-make 2 <target1>`
`2212`	`2212`	`[test] compiletest-rustdoc 2 <target1>`
`@@ -2301,7 +2301,7 @@ mod snapshot {`
`2301`	`2301`	`[build] rustc 0 <host> -> HtmlChecker 1 <host>`
`2302`	`2302`	`[test] html-check <host>`
`2303`	`2303`	`[build] rustc 0 <host> -> RunMakeSupport 1 <host>`
`2304`		`- [build] rustc 2 <host> -> cargo 3 <host>`
	`2304`	`+ [build] rustc 1 <host> -> cargo 2 <host>`
`2305`	`2305`	`[test] compiletest-run-make 2 <host>`
`2306`	`2306`	`");`
`2307`	`2307`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6c3a86b

File tree

2 files changed

2 files changed

`‎src/bootstrap/src/core/build_steps/test.rs`

`‎src/bootstrap/src/core/builder/tests.rs`

0 commit comments