apitest: Tests tracking: break out WantedTests

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/apitest.rs b/apitest.rs
index f7712db339436b20e17ff2ea0f290d5d4adae29f..3f2472b752a1f73e7277564b4fa0f01839235e00 100644 (file)
--- a/apitest.rs
+++ b/apitest.rs
@@ -125,6 +125,13 @@ pub struct Opts {
   #[structopt(long="--pause", default_value="0ms")]
   pub pause: humantime::Duration,
 
+  #[structopt(flatten)]
+  pub tests: WantedTests,
+}
+
+#[derive(Clone,Debug)]
+#[derive(StructOpt)]
+pub struct WantedTests {
   pub tests: Vec<String>,
 }
 

diff --git a/wdriver.rs b/wdriver.rs
index 8a29821c1ea457de138250a62ba8fb6fa3ad2425..6b80c3b1c293c431ab16b8f7a27bc98809e99a0a 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -361,8 +361,8 @@ impl Setup {
   pub fn want_test(&mut self, tname: &str) -> bool {
     self.found_tests.insert(tname.to_owned());
     let y =
-      self.opts.tests.is_empty() ||
-      self.opts.tests.iter().any(|s| s==tname);
+      self.opts.tests.tests.is_empty() ||
+      self.opts.tests.tests.iter().any(|s| s==tname);
     y
   }
 
@@ -652,7 +652,7 @@ impl Drop for Setup {
       .context("screenshots, in Setup::drop")
       .just_warn();
 
-    let missing_tests = self.opts.tests.iter().cloned()
+    let missing_tests = self.opts.tests.tests.iter().cloned()
       .filter(|s| !self.found_tests.contains(s))
       .collect::<Vec<_>>();