Skip to content

Commit

Permalink
Auto merge of rust-lang#3715 - cgettys-microsoft:dev/cgettys/process_…
Browse files Browse the repository at this point in the history
…id_fixup-01, r=RalfJung

Fix miri.bat to not exit unconditionally

rust-lang#3703 has a small typo causing it to regress ./miri.bat to not working at all.

This PR fixes it. Tested on Windows 11, with stable toolchain missing as well as installed.
```test
./miri toolchain
error: toolchain 'stable-x86_64-pc-windows-msvc' is not installed
Failed to build miri-script. Is the 'stable' toolchain installed?
```

Closes rust-lang#3714
  • Loading branch information
bors committed Jun 28, 2024
2 parents 9c21872 + e7e35d7 commit 340b98a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri/miri.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target
:: If any other steps are added, the "|| exit /b" must be appended to early
:: return from the script. If not, it will continue execution.
cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml ^
|| echo Failed to build miri-script. Is the 'stable' toolchain installed? & exit /b
|| (echo Failed to build miri-script. Is the 'stable' toolchain installed? & exit /b)

:: Forwards all arguments to this file to the executable.
:: We invoke the binary directly to avoid going through rustup, which would set some extra
Expand Down

0 comments on commit 340b98a

Please sign in to comment.