From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Jul 2021 11:59:36 +0000 (+0100)
Subject: jstest: improve debugging output
X-Git-Tag: otter-0.7.2~174
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b5598e63eaa6bfde57552123301fa5c2fd270495;p=otter.git

jstest: improve debugging output

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

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index 6e26c4c0..bfa9fbb2 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -245,7 +245,7 @@ impl TestsAccumulator {
                      pieces: Vec<StartPieceSpec>,
                      targets: Vec<T>) where T: TryInto<Vpid> + Copy + Debug {
     let mut zm = ZCoord::default().clone_mut();
-    let pieces = pieces.into_iter().map(
+    let pieces: IndexMap<Vpid,StartPiece> = pieces.into_iter().map(
       |StartPieceSpec { id, pinned, moveable }| {
         let id = id.try_into().unwrap();
         let z = zm.increment().unwrap();
@@ -253,10 +253,19 @@ impl TestsAccumulator {
       }
     ).collect();
 
-    let targets = targets.into_iter().map(
+    let targets: IndexSet<_> = targets.into_iter().map(
       |s| s.try_into().map_err(|_|s).unwrap()
     ).collect();
 
+    eprintln!("-------------------- {} --------------------", name);
+    for (id,p) in pieces.iter() {
+      eprintln!("    {:5} {}{}- {}",
+                id.to_string(),
+                if targets.contains(id) { "T" } else { "_" },
+                if p.bottom()           { "B" } else { "_" },
+                p.z.as_str());
+    }
+
     let test = Test {
       name: name.into(),
       pieces, targets,
@@ -273,6 +282,8 @@ impl TestsAccumulator {
 fn main() {
   let opts = Opts::from_args();
 
+  eprintln!("==================== building ====================");
+
   let mut ta = TestsAccumulator::new(&opts)?;
 
   ta.add_test("simple", vec![
@@ -307,13 +318,16 @@ fn main() {
   
   let tests = ta.finalise()?;
 
+  eprintln!("==================== running ====================");
+
   let mut cmd = Command::new(opts.nodejs);
   cmd.arg(opts.script);
   let status = cmd.status()?;
   assert!(status.success(), "{}", status);
 
+  eprintln!("==================== checking ====================");
+
   for test in tests.tests.values() {
-    println!("checking results for {:?}", &test.name);
     test.check()?;
   }
 }