From 628e213a20484b521492dd3968b7be205a06feaf Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Fri, 14 Mar 2008 00:17:17 -0600
Subject: [PATCH] builder: fix bug

---
 extra/builder/benchmark/benchmark.factor |  2 +-
 extra/builder/builder.factor             |  4 ++++
 extra/builder/test/test.factor           | 22 +++++++++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/extra/builder/benchmark/benchmark.factor b/extra/builder/benchmark/benchmark.factor
index 48891593d2..444e5b6ea7 100644
--- a/extra/builder/benchmark/benchmark.factor
+++ b/extra/builder/benchmark/benchmark.factor
@@ -21,7 +21,7 @@ IN: builder.benchmark
   [ benchmark-difference ] with map ;
 
 : benchmark-deltas ( -- table )
-  "../../benchmarks" "../benchmarks" [ eval-file ] 2apply
+  "../benchmarks" "benchmarks" [ eval-file ] 2apply
   compare-tables
   sort-values ;
 
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index da96e51dd4..52150b07a8 100644
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -4,6 +4,7 @@ USING: kernel namespaces sequences splitting system combinators continuations
        bootstrap.image benchmark vars bake smtp builder.util accessors
        io.encodings.utf8
        calendar
+       tools.test
        builder.common
        builder.benchmark
        builder.release ;
@@ -131,7 +132,10 @@ SYMBOL: build-status
       "Test time: " write "test-time" eval-file milli-seconds>time print nl
 
       "Did not pass load-everything: " print "load-everything-vocabs" cat
+      
       "Did not pass test-all: "        print "test-all-vocabs"        cat
+      "test-all-vocabs" eval-file test-failures.
+      
       "help-lint results:"             print "help-lint"              cat
 
       "Benchmarks: " print "benchmarks" eval-file benchmarks.
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index 409d0db11c..54c40f18c8 100755
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -16,18 +16,18 @@ IN: builder.test
 : do-load ( -- )
   try-everything keys "../load-everything-vocabs" utf8 [ . ] with-file-writer ;
 
-! : do-tests ( -- )
-!   run-all-tests keys "../test-all-vocabs" utf8 [ . ] with-file-writer ;
-
 : do-tests ( -- )
-  run-all-tests
-  "../test-all-vocabs" utf8
-    [
-        [ keys . ]
-        [ test-failures. ]
-      bi
-    ]
-  with-file-writer ;
+  run-all-tests keys "../test-all-vocabs" utf8 [ . ] with-file-writer ;
+
+! : do-tests ( -- )
+!   run-all-tests
+!   "../test-all-vocabs" utf8
+!     [
+!         [ keys . ]
+!         [ test-failures. ]
+!       bi
+!     ]
+!   with-file-writer ;
 
 : do-help-lint ( -- )
   "" run-help-lint "../help-lint" utf8 [ typos. ] with-file-writer ;