Skip to content

Commit a0719e6

Browse files
committed
update Miri argument passing
1 parent 51da04e commit a0719e6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

run-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
## Run a Rust libstd test suite with Miri.
66
## Assumes Miri to be installed.
77
## Usage:
8-
## ./run-test.sh CRATE_NAME
8+
## ./run-test.sh CRATE_NAME CARGO_TEST_ARGS
99
## Environment variables:
1010
## RUST_SRC: The path to the Rust source directory (containing `src`).
1111
## Defaults to `$(rustc --print sysroot)/lib/rustlib/src/rust` or
@@ -35,4 +35,4 @@ ln -s "$RUST_SRC"/library/$CRATE lib$CRATE
3535
# run test
3636
cd ${CRATE}_miri_test
3737
XARGO_RUST_SRC="$RUST_SRC/library" cargo miri setup
38-
MIRI_SYSROOT=~/.cache/miri/HOST cargo miri test -- "$@"
38+
MIRI_SYSROOT=~/.cache/miri/HOST cargo miri test "$@"

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-09-17
1+
nightly-2020-09-21

travis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ cp -a $(rustc --print sysroot)/lib/rustlib/src/rust/ rust-src-patched
99
# run the tests (some also without validation, to exercise those code paths in Miri)
1010
export RUST_SRC=rust-src-patched
1111
echo && echo "## Testing core (no validation, no Stacked Borrows, symbolic alignment)" && echo
12-
./run-test.sh core -Zmiri-disable-validation -Zmiri-disable-stacked-borrows -Zmiri-symbolic-alignment-check -- --skip align 2>&1 | ts -i '%.s '
12+
MIRIFLAGS="-Zmiri-disable-validation -Zmiri-disable-stacked-borrows -Zmiri-symbolic-alignment-check" ./run-test.sh core -- --skip align 2>&1 | ts -i '%.s '
1313
echo && echo "## Testing core" && echo
1414
./run-test.sh core 2>&1 | ts -i '%.s '
1515
echo && echo "## Testing alloc (symbolic alignment)" && echo
16-
./run-test.sh alloc -Zmiri-symbolic-alignment-check 2>&1 | ts -i '%.s '
16+
MIRIFLAGS="-Zmiri-symbolic-alignment-check" ./run-test.sh alloc 2>&1 | ts -i '%.s '

0 commit comments

Comments
 (0)