diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-09-10 17:35:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 17:35:13 +0200 |
| commit | 34c935baf30c87a9b7487a55844dadd003de7110 (patch) | |
| tree | cae965ea7786fc59ef548f9f47bda54ce8456108 /src/bootstrap | |
| parent | f827364a95b93ab70afd0383fcf3caa9da40e1fb (diff) | |
| parent | 62d196feb1607c93fb4bc9dc54bf08883496a6a2 (diff) | |
| download | rust-34c935baf30c87a9b7487a55844dadd003de7110.tar.gz rust-34c935baf30c87a9b7487a55844dadd003de7110.zip | |
Rollup merge of #130143 - RalfJung:miri-test-libstd, r=compiler-errors
miri-test-libstd: add missing BOOTSTRAP_ARGS Note sure if BOOTSTRAP_ARGS will make any difference here, but all the other x.py invocations have it and I did not *deliberately* leave it away when I added these, so... probably best to add them? Also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 9acd85cddde..3fa2b3c2292 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -54,30 +54,34 @@ check-aux: src/etc/test-float-parse \ $(BOOTSTRAP_ARGS) # Run standard library tests in Miri. - $(Q)BOOTSTRAP_SKIP_TARGET_SANITY=1 \ - $(BOOTSTRAP) miri --stage 2 \ + $(Q)$(BOOTSTRAP) miri --stage 2 \ library/core \ library/alloc \ + $(BOOTSTRAP_ARGS) \ --no-doc # Some doctests use file system operations to demonstrate dealing with `Result`. $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(BOOTSTRAP) miri --stage 2 \ library/core \ library/alloc \ + $(BOOTSTRAP_ARGS) \ --doc # In `std` we cannot test everything, so we skip some modules. $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(BOOTSTRAP) miri --stage 2 library/std \ + $(BOOTSTRAP_ARGS) \ --no-doc -- \ --skip fs:: --skip net:: --skip process:: --skip sys::pal:: $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(BOOTSTRAP) miri --stage 2 library/std \ + $(BOOTSTRAP_ARGS) \ --doc -- \ --skip fs:: --skip net:: --skip process:: --skip sys::pal:: # Also test some very target-specific modules on other targets # (making sure to cover an i686 target as well). $(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \ $(BOOTSTRAP) miri --stage 2 library/std \ + $(BOOTSTRAP_ARGS) \ --target aarch64-apple-darwin,i686-pc-windows-msvc \ --no-doc -- \ time:: sync:: thread:: env:: |