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

disable RUST_BACKTRACE in CI, set it inside the test harness instead

Browse Source
This commit is contained in:
Ralf Jung 2024-03-23 18:59:27 +01:00
parent 3d6fcea417
commit bb4ef1a5fb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/miri/.github/workflows/ci.yml vendored
View File

@ -30,7 +30,6 @@ jobs:
host_target: i686-pc-windows-msvc host_target: i686-pc-windows-msvc
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env: env:
RUST_BACKTRACE: 1
HOST_TARGET: ${{ matrix.host_target }} HOST_TARGET: ${{ matrix.host_target }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

13
src/tools/miri/tests/ui.rs
View File

@ -4,9 +4,11 @@ use std::ffi::OsString;
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::{env, process::Command}; use std::{env, process::Command};
use ui_test::color_eyre::eyre::Context; use ui_test::color_eyre::eyre::{Context, Result};
use ui_test::{color_eyre::Result, Config, Match, Mode, OutputConflictHandling}; use ui_test::{
use ui_test::{status_emitter, CommandBuilder, Format, RustfixMode}; status_emitter, CommandBuilder, Config, Format, Match, Mode, OutputConflictHandling,
RustfixMode,
};
fn miri_path() -> PathBuf { fn miri_path() -> PathBuf {
PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri"))) PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
@ -125,6 +127,9 @@ fn run_tests(
// Let the tests know where to store temp files (they might run for a different target, which can make this hard to find). // Let the tests know where to store temp files (they might run for a different target, which can make this hard to find).
config.program.envs.push(("MIRI_TEMP".into(), Some(tmpdir.to_owned().into()))); config.program.envs.push(("MIRI_TEMP".into(), Some(tmpdir.to_owned().into())));
// If a test ICEs, we want to see a backtrace.
config.program.envs.push(("RUST_BACKTRACE".into(), Some("1".into())));
// Handle command-line arguments. // Handle command-line arguments.
let args = ui_test::Args::test()?; let args = ui_test::Args::test()?;
let default_bless = env::var_os("RUSTC_BLESS").is_some_and(|v| v != "0"); let default_bless = env::var_os("RUSTC_BLESS").is_some_and(|v| v != "0");
@ -224,7 +229,7 @@ fn ui(
with_dependencies: Dependencies, with_dependencies: Dependencies,
tmpdir: &Path, tmpdir: &Path,
) -> Result<()> { ) -> Result<()> {
let msg = format!("## Running ui tests in {path} against miri for {target}"); let msg = format!("## Running ui tests in {path} for {target}");
eprintln!("{}", msg.green().bold()); eprintln!("{}", msg.green().bold());
let with_dependencies = match with_dependencies { let with_dependencies = match with_dependencies {