Skip to content

Rollup of 4 pull requests #104990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 48 commits into from
Nov 28, 2022
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7225524
add a weak form of protection that justifies Box noalias
RalfJung Nov 20, 2022
bf9e73f
some things don't need to be mutable
RalfJung Nov 20, 2022
32e9d00
tweaks
RalfJung Nov 20, 2022
105dba7
Auto merge of #2684 - RalfJung:stack-borrows-weak-protectors, r=saethlin
bors Nov 21, 2022
23270ae
Incrementally track which frame to use for diagnostics
saethlin Nov 3, 2022
859310a
ensure current getrandom works with strict provenance
RalfJung Nov 22, 2022
8061e2f
update test_dependencies
RalfJung Nov 22, 2022
8b0b2d1
Auto merge of #2687 - RalfJung:getrandom, r=RalfJung
bors Nov 22, 2022
1ca3c29
Document is_user_relevant
saethlin Nov 22, 2022
a312329
Update src/machine.rs
saethlin Nov 23, 2022
448f044
replace a borrow_mut by get_mut
RalfJung Nov 25, 2022
fe81522
Auto merge of #2691 - RalfJung:get_mut, r=RalfJung
bors Nov 25, 2022
2c456b5
Test a small cargo-miri smoke test even in `run_tests_minimal`
Noratrieb Nov 24, 2022
8961e13
Use None when the stack is empty
saethlin Nov 25, 2022
726b9d0
caller_span only makes sense when there are 2 frames on the stack
RalfJung Nov 26, 2022
7d0db1e
Auto merge of #2647 - saethlin:current-span, r=RalfJung
bors Nov 26, 2022
166e60e
update lockfile
RalfJung Nov 26, 2022
4d3e565
Auto merge of #2690 - Nilstrieb:cargo-miri-smoke-test-ci-so-that-carg…
bors Nov 26, 2022
56a1d07
prettify our CI logs
RalfJung Nov 26, 2022
b3e4402
Auto merge of #2695 - RalfJung:ci-pretty, r=RalfJung
bors Nov 26, 2022
0822c31
add namespace to resolve_path
beepster4096 Nov 9, 2022
245857b
refactor try_resolve_did and also support resolving crates/modules
RalfJung Nov 26, 2022
3158a8d
support no_std on Windows
RalfJung Nov 26, 2022
144b485
Auto merge of #2696 - RalfJung:no-std-windows, r=RalfJung
bors Nov 26, 2022
b19e034
Switch rustdoc-gui test to function call
GuillaumeGomez Nov 26, 2022
f479404
!Unpin retags must still be reads, to check dereferenceable
RalfJung Nov 26, 2022
a7f7221
slightly adjust and synchronize Machine passing for SB and DataRace
RalfJung Nov 26, 2022
a3bd578
make Stacked Borrows retags act like data races
RalfJung Nov 26, 2022
edf8154
nits
RalfJung Nov 26, 2022
958d591
Use `.wasm` extension when building for wasm in cargo-miri
Noratrieb Nov 21, 2022
1d42936
Prefer doc comments over `//`-comments in compiler
WaffleLapkin Nov 27, 2022
b20efbd
CI: fix begingroup printing
RalfJung Nov 27, 2022
5a14c5a
Auto merge of #2700 - RalfJung:begingroup, r=RalfJung
bors Nov 27, 2022
c6587b0
run_tests_minimal: actually run the smoke test on the desired target
RalfJung Nov 27, 2022
9f8df93
Auto merge of #2701 - RalfJung:smoke, r=RalfJung
bors Nov 27, 2022
a83b105
Auto merge of #2685 - Nilstrieb:cargo-miri-wasm, r=RalfJung
bors Nov 27, 2022
5856e40
Remove Crate::primitives field
GuillaumeGomez Nov 27, 2022
23c3941
Add rustdoc test for Deref to primitive types
GuillaumeGomez Nov 27, 2022
66354f0
Auto merge of #2694 - RalfJung:retag-deref-check, r=saethlin
bors Nov 27, 2022
187ba67
Preparing for merge from rustc
RalfJung Nov 27, 2022
7c12ed1
Merge from rustc
RalfJung Nov 27, 2022
6d1e99e
advice on josh pushing
RalfJung Nov 27, 2022
598c3da
clippy
RalfJung Nov 27, 2022
f8fbc6d
Auto merge of #2702 - RalfJung:rustup, r=RalfJung
bors Nov 27, 2022
53cfcfb
Rollup merge of #104955 - GuillaumeGomez:migrate-to-func, r=notriddle
matthiaskrgr Nov 27, 2022
86304f5
Rollup merge of #104976 - WaffleLapkin:move_comments, r=cjgillot
matthiaskrgr Nov 27, 2022
5ea36cf
Rollup merge of #104984 - GuillaumeGomez:remote-crate-primitives, r=n…
matthiaskrgr Nov 27, 2022
2ccb38b
Rollup merge of #104989 - RalfJung:miri, r=RalfJung
matthiaskrgr Nov 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
prettify our CI logs
  • Loading branch information
RalfJung committed Nov 26, 2022
commit 56a1d07cb7b78cadf7f8b260c1035bc48e33a17d
29 changes: 22 additions & 7 deletions src/tools/miri/ci.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
#!/bin/bash
set -euo pipefail
set -x

function begingroup {
echo "::group::$1"
set -x
}

function endgroup {
set +x
echo "::endgroup"
}

begingroup "Building Miri"

# Determine configuration for installed build
echo "Installing release version of Miri"
Expand All @@ -14,14 +25,15 @@ export CARGO_EXTRA_FLAGS="--locked"
./miri check --no-default-features # make sure this can be built
./miri check --all-features # and this, too
./miri build --all-targets # the build that all the `./miri test` below will use
echo

endgroup

# Test
function run_tests {
if [ -n "${MIRI_TEST_TARGET+exists}" ]; then
echo "Testing foreign architecture $MIRI_TEST_TARGET"
begingroup "Testing foreign architecture $MIRI_TEST_TARGET"
else
echo "Testing host architecture"
begingroup "Testing host architecture"
fi

## ui test suite
Expand Down Expand Up @@ -52,7 +64,6 @@ function run_tests {
echo 'build.rustc-wrapper = "thisdoesnotexist"' > .cargo/config.toml
# Run the actual test
${PYTHON} test-cargo-miri/run-test.py
echo
# Clean up
unset RUSTC MIRI
rm -rf .cargo
Expand All @@ -63,20 +74,24 @@ function run_tests {
cargo miri run --manifest-path bench-cargo-miri/$BENCH/Cargo.toml
done
fi

endgroup
}

function run_tests_minimal {
if [ -n "${MIRI_TEST_TARGET+exists}" ]; then
echo "Testing MINIMAL foreign architecture $MIRI_TEST_TARGET: only testing $@"
begingroup "Testing MINIMAL foreign architecture $MIRI_TEST_TARGET: only testing $@"
else
echo "Testing MINIMAL host architecture: only testing $@"
begingroup "Testing MINIMAL host architecture: only testing $@"
fi

./miri test -- "$@"

# Ensure that a small smoke test of cargo-miri works.
# Note: This doesn't work on windows because of TLS.
cargo miri run --manifest-path test-cargo-miri/no-std-smoke/Cargo.toml

endgroup
}

# host
Expand Down