diff options
| author | bors <bors@rust-lang.org> | 2022-05-08 11:14:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-08 11:14:47 +0000 |
| commit | 8fbd92d0b95d847c68948d8dbbfaccb470db4f92 (patch) | |
| tree | ef2386ca8f46dc683348daf8e9943143b425d2c7 | |
| parent | 4c09a3345ab10b9a10a284cea1a1f3673bc9a414 (diff) | |
| parent | 72d2d6a4ba40fae2254a03f7782a80b8b315ddbc (diff) | |
| download | rust-8fbd92d0b95d847c68948d8dbbfaccb470db4f92.tar.gz rust-8fbd92d0b95d847c68948d8dbbfaccb470db4f92.zip | |
Auto merge of #96689 - gimbles:campfire, r=Mark-Simulacrum
Move check-bootstrap from a makefile rule to test::Bootstrap Fixes #96688
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 2 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 4 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index fd39944e176..5a1f2e70413 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -45,8 +45,6 @@ check-aux: src/tools/cargo \ src/tools/cargotest \ $(BOOTSTRAP_ARGS) -check-bootstrap: - $(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py dist: $(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS) distcheck: diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 8f2347be90e..bc851568f89 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -2351,6 +2351,10 @@ impl Step for Bootstrap { /// Tests the build system itself. fn run(self, builder: &Builder<'_>) { + let mut check_bootstrap = Command::new(&builder.python()); + check_bootstrap.arg("bootstrap_test.py").current_dir(builder.src.join("src/bootstrap/")); + try_run(builder, &mut check_bootstrap); + let mut cmd = Command::new(&builder.initial_cargo); cmd.arg("test") .current_dir(builder.src.join("src/bootstrap")) diff --git a/src/ci/run.sh b/src/ci/run.sh index 948445427d9..5f843a13bcd 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -141,8 +141,6 @@ $SRC/configure $RUST_CONFIGURE_ARGS retry make prepare -make check-bootstrap - # Display the CPU and memory information. This helps us know why the CI timing # is fluctuating. if isMacOS; then |