From 9c9f0d68c451bda308866027b0683e68c22e6faa Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Fri, 19 Feb 2021 17:54:27 -0800
Subject: [PATCH] test: report and continue on build failures

---
 pkg/arvo/lib/strandio.hoon   |  8 ++++----
 pkg/arvo/ted/build-file.hoon |  9 ++++++---
 pkg/arvo/ted/test.hoon       | 25 ++++++++++++++++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon
index d55e8a8d7a..039b493df9 100644
--- a/pkg/arvo/lib/strandio.hoon
+++ b/pkg/arvo/lib/strandio.hoon
@@ -442,19 +442,19 @@
   ;<  ~  bind:m  (send-request (hiss-to-request:html hiss))
   take-maybe-sigh
 ::
-::  +build-fail: build the source file at the specified $beam
+::  +build-file: build the source file at the specified $beam
 ::
 ++  build-file
   |=  [[=ship =desk =case] =spur]
   =*  arg  +<
-  =/  m  (strand ,vase)
+  =/  m  (strand ,(unit vase))
   ^-  form:m
   ;<  =riot:clay  bind:m
     (warp ship desk ~ %sing %a case spur)
   ?~  riot
-    (strand-fail %build-file >arg< ~)
+    (pure:m ~)
   ?>  =(%vase p.r.u.riot)
-  (pure:m !<(vase q.r.u.riot))
+  (pure:m (some !<(vase q.r.u.riot)))
 ::  +build-mark: build a mark definition to a $dais
 ::
 ++  build-mark
diff --git a/pkg/arvo/ted/build-file.hoon b/pkg/arvo/ted/build-file.hoon
index 5311b0795c..5b4a884cb8 100644
--- a/pkg/arvo/ted/build-file.hoon
+++ b/pkg/arvo/ted/build-file.hoon
@@ -6,6 +6,9 @@
 =/  m  (strand ,vase)
 ^-  form:m
 =+  !<([~ pax=path] arg)
-?^  bem=(de-beam pax)
-  (build-file:strandio u.bem)
-(strand-fail:strand %path-not-beam >pax< ~)
+?~  bem=(de-beam pax)
+  (strand-fail:strand %path-not-beam >pax< ~)
+;<  vax=(unit vase)  bind:m  (build-file:strandio u.bem)
+?^  vax
+  (pure:m u.vax)
+(strand-fail:strand %build-file >u.bem< ~)
diff --git a/pkg/arvo/ted/test.hoon b/pkg/arvo/ted/test.hoon
index 3b0027b3e5..a25496fc22 100644
--- a/pkg/arvo/ted/test.hoon
+++ b/pkg/arvo/ted/test.hoon
@@ -92,8 +92,12 @@
       ?.  =(%hoon (rear p))  ~
       (some [[-.i.bez p] ~])
     loop(bez t.bez, fiz (~(gas in fiz) foz))
-  ~|  bad-test-beam+i.bez
-  =/  tex=term  =-(?>(((sane %tas) -) -) (rear s.i.bez))
+  ::
+  ::  XX this logic appears to be vestigial
+  ::
+  =/  tex=term
+    ~|  bad-test-beam+i.bez
+    =-(?>(((sane %tas) -) -) (rear s.i.bez))
   =/  xup=path  (snip s.i.bez)
   ;<  hov=?  bind:m  (check-for-file:strandio i.bez(s (snoc xup %hoon)))
   ?.  hov
@@ -107,16 +111,23 @@
 =/  paz=(list path)
   (tail !<([~ (list path)] arg))
 =/  bez=(list beam)
-  (turn paz |=(p=path (need (de-beam p))))
+  (turn paz |=(p=path ~|([%test-not-beam p] (need (de-beam p)))))
 ;<  fiz=(set [=beam test=(unit term)])  bind:m  (find-test-files bez)
 =>  .(fiz (sort ~(tap in fiz) aor))
 =|  test-arms=(map path (list test-arm))
+=|  build-ok=?
 |-  ^-  form:m
 =*  gather-tests  $
 ?^  fiz
-  ~>  %slog.0^leaf+"test: building {(spud s.beam.i.fiz)}"
-  ;<  cor=vase  bind:m  (build-file:strandio beam.i.fiz)
-  =/  arms=(list test-arm)  (get-test-arms cor)
+  ;<  cor=(unit vase)  bind:m  (build-file:strandio beam.i.fiz)
+  ?~  cor
+    ~>  %slog.0^leaf+"FAILED  {(spud s.beam.i.fiz)} (build)"
+    gather-tests(fiz t.fiz, build-ok |)
+  ~>  %slog.0^leaf+"built   {(spud s.beam.i.fiz)}"
+  =/  arms=(list test-arm)  (get-test-arms u.cor)
+  ::
+  ::  XX this logic appears to be vestigial
+  ::
   =?  arms  ?=(^ test.i.fiz)
     |-  ^+  arms
     ?~  arms  ~|(no-test-arm+i.fiz !!)
@@ -127,7 +138,7 @@
   gather-tests(fiz t.fiz)
 %-  pure:m  !>  ^=  ok
 %+  roll  (resolve-test-paths test-arms)
-|=  [[=path =test-func] ok=_`?`%&]
+|=  [[=path =test-func] ok=_build-ok]
 ^+  ok
 =/  res  (run-test path test-func)
 %-  (slog (flop tang.res))