builder: run builder.test using a more robust process descriptor

extra/builder/builder.factor

@@ -88,8 +88,20 @@ VAR: stamp
     20 minutes>ms >>timeout
   >desc ;
 
-: builder-test ( -- desc ) { factor-binary "-run=builder.test" } to-strings ;
-  
+! : builder-test ( -- desc ) { factor-binary "-run=builder.test" } to-strings ;
+
+: builder-test-cmd ( -- cmd )
+  { factor-binary "-run=builder.test" } to-strings ;
+
+: builder-test ( -- desc )
+  <process*>
+    builder-test-cmd >>arguments
+    +closed+         >>stdin
+    "../test-log"    >>stdout
+    +stdout+         >>stderr
+    45 minutes>ms    >>timeout
+  >desc ;
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 SYMBOL: build-status
@@ -125,9 +137,11 @@ SYMBOL: build-status
 
     bootstrap [ "Bootstrap error" print "../boot-log" cat ] run-or-bail
 
-    [ builder-test try-process ]
-    [ "Builder test error" print throw ]
-    recover
+!     [ builder-test try-process ]
+!     [ "Builder test error" print throw ]
+!     recover
+
+    builder-test [ "Test error" print "../test-log" cat ] run-or-bail
 
     "Boot time: " write "../boot-time" eval-file milli-seconds>time print
     "Load time: " write "../load-time" eval-file milli-seconds>time print

extra/builder/util/util.factor

@@ -83,11 +83,4 @@ TUPLE: process* arguments stdin stdout stderr timeout ;
 
 USING: bootstrap.image bootstrap.image.download io.streams.null ;
 
-: retrieve-image ( -- ) [ my-arch download-image ] with-null-stream ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: copy-image ( -- )
-  "../../factor/" my-arch boot-image-name append
-  my-arch boot-image-name
-  copy-file ;
+: retrieve-image ( -- ) [ my-arch download-image ] with-null-stream ;