From 6047429401aa6790ba6ca9c6832f30d3327ec36f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Jul 2008 16:57:30 -0500
Subject: [PATCH] More unit test fixes

---
 basis/compiler/tests/redefine1.factor | 2 +-
 basis/compiler/tests/redefine2.factor | 2 +-
 basis/compiler/tests/redefine3.factor | 2 +-
 basis/compiler/tests/simple.factor    | 2 +-
 basis/locals/locals-tests.factor      | 2 +-
 core/bootstrap/stage1.factor          | 3 +--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/tests/redefine1.factor b/basis/compiler/tests/redefine1.factor
index d448d031b9..6773eb6b6a 100644
--- a/basis/compiler/tests/redefine1.factor
+++ b/basis/compiler/tests/redefine1.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: accessors compiler compiler.units tools.test math parser
 kernel sequences sequences.private classes.mixin generic
-definitions arrays words assocs ;
+definitions arrays words assocs eval ;
 
 GENERIC: method-redefine-test ( a -- b )
 
diff --git a/basis/compiler/tests/redefine2.factor b/basis/compiler/tests/redefine2.factor
index 107381c4d3..c20a6d6233 100644
--- a/basis/compiler/tests/redefine2.factor
+++ b/basis/compiler/tests/redefine2.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: compiler compiler.units tools.test math parser kernel
 sequences sequences.private classes.mixin generic definitions
-arrays words assocs ;
+arrays words assocs eval ;
 
 DEFER: blah
 
diff --git a/basis/compiler/tests/redefine3.factor b/basis/compiler/tests/redefine3.factor
index f7175aac55..941d086312 100644
--- a/basis/compiler/tests/redefine3.factor
+++ b/basis/compiler/tests/redefine3.factor
@@ -1,7 +1,7 @@
 IN: compiler.tests
 USING: accessors compiler compiler.units tools.test math parser
 kernel sequences sequences.private classes.mixin generic
-definitions arrays words assocs ;
+definitions arrays words assocs eval ;
 
 GENERIC: sheeple ( obj -- x )
 
diff --git a/basis/compiler/tests/simple.factor b/basis/compiler/tests/simple.factor
index 272f92ec07..c18ab3e335 100755
--- a/basis/compiler/tests/simple.factor
+++ b/basis/compiler/tests/simple.factor
@@ -1,6 +1,6 @@
 USING: compiler.units tools.test kernel kernel.private
 sequences.private math.private math combinators strings
-alien arrays memory vocabs parser ;
+alien arrays memory vocabs parser eval ;
 IN: compiler.tests
 
 ! Test empty word
diff --git a/basis/locals/locals-tests.factor b/basis/locals/locals-tests.factor
index 025e175bc2..23a1ee9284 100755
--- a/basis/locals/locals-tests.factor
+++ b/basis/locals/locals-tests.factor
@@ -1,6 +1,6 @@
 USING: locals math sequences tools.test hashtables words kernel
 namespaces arrays strings prettyprint io.streams.string parser
-accessors generic ;
+accessors generic eval ;
 IN: locals.tests
 
 :: foo ( a b -- a a ) a a ;
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index f9a0ddce8f..92558561d2 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -7,13 +7,12 @@ init io.files bootstrap.image bootstrap.image.private vocabs
 vocabs.loader system debugger continuations ;
 IN: bootstrap.stage1
 
-{ "resource:core" } vocab-roots set
-
 "Bootstrap stage 1..." print flush
 
 "resource:core/bootstrap/primitives.factor" run-file
 
 load-help? off
+{ "resource:core" } vocab-roots set
 
 ! Create a boot quotation for the target
 [