check: Rework to run all the subplotlib tests at once

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/check b/check
index a7e6f19..7168226 100755
--- a/check
+++ b/check
@@ -180,7 +180,7 @@ def check_rust(r, strict=False):
     elif strict:
         sys.exit("Strict Rust checks specified, but clippy was not found")
     r.runcmd(["cargo", "test"])
-    r.runcmd(["cargo", "fmt"])
+    r.runcmd(["cargo", "fmt", "--", "--check"])
 
 
 def check_subplots(r):
@@ -234,11 +234,16 @@ def check_subplotlib(r):
         base, _ = os.path.splitext(md)
         test_rs = os.path.join("tests", base + ".rs")
         r.codegen(md, test_rs, cwd=dirname)
-        r.cargo(["fmt"], cwd=dirname)
-        r.cargo(["test", "--test", base], cwd=dirname)
         r.docgen(md, base + ".html", cwd=dirname)
         r.docgen(md, base + ".pdf", cwd=dirname)
 
+    # Format the code once more to keep things clean
+    r.title("Formatting subplotlib")
+    r.cargo(["fmt", "-p", "subplotlib"], cwd=dirname)
+    # Run all of the integration suites (many of which have come from the above)
+    r.title("Running subplotlib integration tests")
+    r.cargo(["test", "-p", "subplotlib", "--tests"])
+
 
 def check_tooling(r):
     """Check build environment for tooling the test suite needs"""