mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move check-bootstrap from a makefile rule to test::Bootstrap

Browse Source
This commit is contained in:
gimbles 2022-05-07 09:07:07 +05:30
parent bb1a03c4fc
commit 72d2d6a4ba
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/mk/Makefile.in
View File

@ -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:

4
src/bootstrap/test.rs
View File

@ -2356,6 +2356,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"))

2
src/ci/run.sh
View File

@ -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