More unit test fixes

diff --git a/basis/compiler/tests/redefine1.factor b/basis/compiler/tests/redefine1.factor
index d448d031b94d62a1b72ea1e89b3fed960c4eba3e..6773eb6b6a5474812167a73343bebf7808204a7a 100644 (file)
--- 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 107381c4d3b73dd3e91859eceed9b7baba52b24b..c20a6d623303fd55c28c1712905974efdea50f8f 100644 (file)
--- 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 f7175aac557a11a4ee6d1947ff9110b030e14c2a..941d0863124340351bd3b6eea236bcea7070c3a7 100644 (file)
--- 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 272f92ec075f3b6ad7aef413dc1c8a314754b9c2..c18ab3e335e8a778c9f9ecaebae5ea220714912f 100755 (executable)
--- 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 025e175bc2734c67b607aadeb66972ca4b8ae5cc..23a1ee928418f2931e9021ce314a09d810dada44 100755 (executable)
--- 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 f9a0ddce8fa60aee8aecd6887b0a5c780a4076ef..92558561d219c2af2022723168a93dd78ea24304 100755 (executable)
--- 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
 [