wip2

test.py

@@ -165,17 +165,45 @@ def q(s): return s.encode('unicode-escape').decode()
     for _, tc := range tab {
         tc := tc
         t.Run(tc.name, func(t *testing.T) {
-            b := new(bytes.Buffer)
-            Interpret([]byte(tc.input), OptOutput(b), OptDisasm(tc.disasm))
-
-            s := b.String()
-            s = strings.TrimRight(s, "\n")
-            if s != tc.output {
-                t.Errorf("mismatch:\nhave: %s\nwant: %s", s, tc.output)
+            out := new(bytes.Buffer)
+            log := new(bytes.Buffer)
+
+            _, err := Interpret(
+                []byte(tc.input),
+                OptDisasm(tc.disasm),
+                OptOutput(out), OptLogger(log),
+            )
+
+            switch {
+            case err != nil && !tc.errAllowed:
+                t.Errorf("unexpected error: %s", relevantError(err, log.String()))
+
+            case err != nil && tc.errAllowed:
+                rerr := relevantError(err, log.String())
+                if !strings.Contains(rerr, tc.errMatch) {
+                    t.Errorf("error mismatch\nhave: %s\nwant matching: %s",
+                        rerr, tc.errMatch,
+                    )
+                }
+
+            case err == nil:
+                s := strings.TrimRight(out.String(), "\n")
+                if s != tc.output {
+                    t.Errorf("mismatch:\nhave: %s\nwant: %s", s, tc.output)
+                }
             }
         })
     }
-}"""
+}
+
+func relevantError(err error, logged string) string {
+    if s := err.Error(); strings.HasPrefix(s, "combined errors") {
+        return logged
+    } else {
+        return s
+    }
+}
+"""
 
 
 def generate():