From a2e6c372136f35a1d62a8add94293efbd8b52649 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Feb 2008 18:30:20 -0600
Subject: [PATCH] simplify builder.test

---
 extra/builder/builder.factor   |  9 +++++--
 extra/builder/test/test.factor | 48 ++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 5e992ccc81..caa381ba5d 100755
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -1,8 +1,8 @@
 
-USING: kernel io io.files io.launcher hashtables tools.deploy.backend
+USING: kernel io io.files io.launcher hashtables
        system continuations namespaces sequences splitting math.parser
        prettyprint tools.time calendar bake vars http.client
-       combinators ;
+       combinators bootstrap.image ;
 
 IN: builder
 
@@ -82,6 +82,11 @@ VAR: stamp
   ]
   if
 
+  {
+    "git" "pull" "--no-summary"
+    "http://dharmatech.onigirihouse.com/factor.git" "master"
+  } run-process process-status
+
   "/builds/" stamp> append make-directory
   "/builds/" stamp> append cd
 
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index fb9c62e2aa..2a867b1fbc 100644
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -7,28 +7,42 @@ USING: kernel sequences assocs builder continuations vocabs vocabs.loader
 
 IN: builder.test
 
+! : do-load ( -- )
+!   [
+!     [ load-everything ]
+!     [ require-all-error-vocabs "../load-everything-log" log-object ]
+!     recover
+!   ]
+!   "../load-everything-time" log-runtime ;
+
 : do-load ( -- )
-  [
-    [ load-everything ]
-    [ require-all-error-vocabs "../load-everything-log" log-object ]
-    recover
-  ]
-  "../load-everything-time" log-runtime ;
+  [ try-everything ] "../load-everything-time" log-runtime
+  dup empty?
+    [ drop ]
+    [ "../load-everything-log" log-object ]
+  if ;
+
+! : do-tests ( -- )
+!   "" child-vocabs
+!   [ vocab-source-loaded? ] subset
+!   [ vocab-tests-path ] map
+!   [ dup [ ?resource-path exists? ] when ] subset
+!   [ dup run-test ] { } map>assoc
+!   [ second empty? not ] subset
+!   dup empty?
+!   [ drop ]
+!   [
+!     "../failing-tests" <file-writer>
+!       [ [ nl failures. ] assoc-each ]
+!     with-stream
+!   ]
+!   if ;
 
 : do-tests ( -- )
-  "" child-vocabs
-  [ vocab-source-loaded? ] subset
-  [ vocab-tests-path ] map
-  [ dup [ ?resource-path exists? ] when ] subset
-  [ dup run-test ] { } map>assoc
-  [ second empty? not ] subset
+  run-all-tests keys
   dup empty?
   [ drop ]
-  [
-    "../failing-tests" <file-writer>
-      [ [ nl failures. ] assoc-each ]
-    with-stream
-  ]
+  [ "../failing-tests" log-object ]
   if ;
 
 : do-all ( -- ) do-load do-tests ;