apitest: make test! use a wanted_tests() method on $c

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

diff --git a/apitest.rs b/apitest.rs
index eea5acf29761288daa414893ff673e15ac9efde2..690df4b694dd8fe028f4bbd309932308932065a0 100644 (file)
--- a/apitest.rs
+++ b/apitest.rs
@@ -226,7 +226,7 @@ impl Drop for TrackWantedTests {
 #[macro_export]
 macro_rules! test {
   ($c:expr, $tname:expr, $s:stmt) => {
-    if $c.su.wanted_tests.wantp($tname) {
+    if $c.wanted_tests().wantp($tname) {
       debug!("-------------------- {} starting --------------------", $tname);
       $s
       info!("-------------------- {} completed --------------------", $tname);

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index c9095f01663e0211a8793c63f47425b27efbcafe..e2ce45a6a78f626b63b7e5ec3d844ce6a8af5174 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -16,6 +16,12 @@ struct Ctx {
 }
 deref_to_field!{Ctx, SetupCore, su}
 
+impl Ctx {
+  fn wanted_tests(&mut self) -> &mut TrackWantedTests {
+    &mut self.su.wanted_tests
+  }
+}
+
 #[derive(Debug)]
 struct Player {
   url: String,

diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs
index 28c1b10108c3111c3ba00a49f55b70f0ddbf90e4..90edfc4ed23e24b5ad6b185625aee4bfd5857f61 100644 (file)
--- a/wdriver/wdt-altergame.rs
+++ b/wdriver/wdt-altergame.rs
@@ -12,6 +12,10 @@ struct Ctx {
 }
 
 impl Ctx {
+  fn wanted_tests(&mut self) -> &mut TrackWantedTests {
+    &mut self.su.wanted_tests
+  }
+
   #[throws(AE)]
   fn check_link(&mut self, desc: &'static str, url: Option<&str>) {
     (||{

diff --git a/wdriver/wdt-hand.rs b/wdriver/wdt-hand.rs
index 301f0be7d4a25edcc65b9e7734f1cd3b347f893f..7c20e67169ac9a3bfdcc29b4b9c8a799f76715b4 100644 (file)
--- a/wdriver/wdt-hand.rs
+++ b/wdriver/wdt-hand.rs
@@ -11,6 +11,12 @@ struct Ctx {
 }
 deref_to_field!{Ctx, Setup, su}
 
+impl Ctx {
+  fn wanted_tests(&mut self) -> &mut TrackWantedTests {
+    &mut self.su.wanted_tests
+  }
+}
+
 const HAND: &str = "6.1";
 const ALICE: &str = "1#1";
 

diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 167235e7a46ceeaf22c70f12b227a8276f8ead20..24063b088308ba360fd12754d1bb75fb2d2f8582 100644 (file)
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -13,6 +13,10 @@ struct Ctx {
 deref_to_field!{Ctx, Setup, su}
 
 impl Ctx {
+  fn wanted_tests(&mut self) -> &mut TrackWantedTests {
+    &mut self.su.wanted_tests
+  }
+
   #[throws(AE)]
   fn drag(&mut self){
     let su = &mut self.su;