fmt
This commit is contained in:
+15
-9
@@ -212,8 +212,10 @@ pub fn run_source_build(
|
||||
) -> Result<SourceBuildOutput, Box<dyn Error>> {
|
||||
// Without a live UI, test runs still capture command output into the
|
||||
// per-test log file instead of letting it inherit the terminal
|
||||
let sink: Option<Arc<dyn LineSink>> =
|
||||
ui.as_ref().map(|u| u.sink()).or_else(crate::test_support::subprocess_sink);
|
||||
let sink: Option<Arc<dyn LineSink>> = ui
|
||||
.as_ref()
|
||||
.map(|u| u.sink())
|
||||
.or_else(crate::test_support::subprocess_sink);
|
||||
// ------------------------------------------------------------------
|
||||
// 1. Sanity checks
|
||||
// ------------------------------------------------------------------
|
||||
@@ -1315,10 +1317,9 @@ mod differential_tests {
|
||||
}
|
||||
|
||||
fn copy_path(src: &Path, dst_root: &Path) {
|
||||
let status = crate::test_support::run_logged(
|
||||
Command::new("cp").arg("-a").arg(src).arg(dst_root),
|
||||
)
|
||||
.expect("run cp -a");
|
||||
let status =
|
||||
crate::test_support::run_logged(Command::new("cp").arg("-a").arg(src).arg(dst_root))
|
||||
.expect("run cp -a");
|
||||
assert!(
|
||||
status.success(),
|
||||
"cp -a {} {} failed",
|
||||
@@ -1329,9 +1330,14 @@ mod differential_tests {
|
||||
|
||||
fn run_dpkg(tree: &Path) {
|
||||
let status = crate::test_support::run_logged(
|
||||
Command::new("dpkg-buildpackage")
|
||||
.current_dir(tree)
|
||||
.args(["-S", "-I", "-i", "-nc", "-d", "--no-sign"]),
|
||||
Command::new("dpkg-buildpackage").current_dir(tree).args([
|
||||
"-S",
|
||||
"-I",
|
||||
"-i",
|
||||
"-nc",
|
||||
"-d",
|
||||
"--no-sign",
|
||||
]),
|
||||
)
|
||||
.expect("failed to run dpkg-buildpackage (is dpkg-dev installed?)");
|
||||
assert!(status.success(), "dpkg-buildpackage failed");
|
||||
|
||||
Reference in New Issue
Block a user