Auto merge of #2434 - RalfJung:ui-test-locked, r=oli-obk
ui_test: build dependencies in locked mode unless bless is enabled This should help ensure that tests are reproducible.
This commit is contained in:
commit
30d1c68206
@ -5,7 +5,7 @@
|
|||||||
process::Command,
|
process::Command,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::Config;
|
use crate::{Config, OutputConflictHandling};
|
||||||
|
|
||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Dependencies {
|
pub struct Dependencies {
|
||||||
@ -40,6 +40,9 @@ pub fn build_dependencies(config: &Config) -> Result<Dependencies> {
|
|||||||
let setup_command = |cmd: &mut Command| {
|
let setup_command = |cmd: &mut Command| {
|
||||||
cmd.envs(envs.iter().map(|(k, v)| (k, v)));
|
cmd.envs(envs.iter().map(|(k, v)| (k, v)));
|
||||||
cmd.arg("--manifest-path").arg(manifest_path);
|
cmd.arg("--manifest-path").arg(manifest_path);
|
||||||
|
if matches!(config.output_conflict_handling, OutputConflictHandling::Error) {
|
||||||
|
cmd.arg("--locked");
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
setup_command(&mut build);
|
setup_command(&mut build);
|
||||||
|
Loading…
Reference in New Issue
Block a user