chiark / gitweb /
wip otter cmd debug
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 28 Dec 2020 22:54:46 +0000 (22:54 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 28 Dec 2020 22:54:46 +0000 (22:54 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
wdriver.rs

index ed9658db16e63876a0346b8bf1769df19ccf0653..aa2fd1f982c1a976b319524303eaa0ac20839d45 100644 (file)
@@ -558,14 +558,15 @@ _ = "error" # rocket
 
 impl DirSubst {
   #[throws(AE)]
-  pub fn otter<S:AsRef<std::ffi::OsStr>>(&self, args: &[S]) {
+  pub fn otter<S:AsRef<str>>(&self, xargs: &[S]) {
     let ds = self;
     let exe = ds.subst("@target@/debug/otter")?;
+    let mut args : Vec<&str> = vec![];
+    args.extend(&["--config", CONFIG]);
+    args.extend(xargs.iter().map(AsRef::as_ref));
     (||{
       let mut cmd = Command::new(&exe);
-      cmd
-        .args(&["--config", CONFIG])
-        .args(&*args);
+      cmd.args(&args);
       let st = cmd
         .spawn().context("spawn")?
         .wait().context("wait")?;