load-all now skips vocabs tagged 'not loaded', and test-all skips vocabs tagged 'not tested'

basis/tools/test/test.factor

@@ -2,11 +2,12 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators compiler.units
 continuations debugger effects fry generalizations io io.files
-io.styles kernel lexer locals macros math.parser namespaces parser
+io.styles kernel lexer locals macros math.parser namespaces
-vocabs.parser prettyprint quotations sequences source-files splitting
+parser vocabs.parser prettyprint quotations sequences
-stack-checker summary unicode.case vectors vocabs vocabs.loader
+source-files splitting stack-checker summary unicode.case
-vocabs.files words tools.errors source-files.errors io.streams.string
+vectors vocabs vocabs.loader vocabs.files vocabs.metadata words
-make compiler.errors ;
+tools.errors source-files.errors io.streams.string make
+compiler.errors ;
 IN: tools.test
 
 TUPLE: test-failure < source-file-error continuation ;
@@ -126,7 +127,7 @@ SYMBOL: forget-tests?
     forget-tests? get
     [ [ [ forget-source ] each ] with-compilation-unit ] [ drop ] if ;
 
-: run-vocab-tests ( vocab -- )
+: test-vocab ( vocab -- )
     vocab dup [
         dup source-loaded?>> [
             vocab-tests
@@ -136,6 +137,8 @@ SYMBOL: forget-tests?
         ] [ drop ] if
     ] [ drop ] if ;
 
+: test-vocabs ( vocabs -- ) [ test-vocab ] each ;
+
 PRIVATE>
 
 TEST: unit-test
@@ -154,7 +157,6 @@ M: test-failure error. ( error -- )
 
 : :test-failures ( -- ) test-failures get errors. ;
 
-: test ( prefix -- )
+: test ( prefix -- ) child-vocabs test-vocabs ;
-    child-vocabs [ run-vocab-tests ] each ;
 
-: test-all ( -- ) "" test ;
+: test-all ( -- ) vocabs filter-don't-test test-vocabs ;

basis/vocabs/hierarchy/hierarchy.factor

@@ -97,9 +97,6 @@ MEMO: all-vocabs-recursive ( -- assoc )
 
 <PRIVATE
 
-: filter-unportable ( seq -- seq' )
-    [ vocab-name unportable? not ] filter ;
-
 : collect-vocabs ( quot -- seq )
     [ all-vocabs-recursive no-roots no-prefixes ] dip
     gather natural-sort ; inline
@@ -109,7 +106,7 @@ PRIVATE>
 : (load) ( prefix -- failures )
     [ child-vocabs-recursive no-roots no-prefixes ]
     [ dup find-vocab-root [ >vocab-link prefix ] [ drop ] if ] bi
-    filter-unportable
+    filter-don't-load
     require-all ;
 
 : load ( prefix -- )

basis/vocabs/metadata/metadata.factor

@@ -103,12 +103,21 @@ ERROR: bad-platform name ;
 : supported-platform? ( platforms -- ? )
     [ t ] [ [ os swap class<= ] any? ] if-empty ;
 
-: unportable? ( vocab -- ? )
+: don't-load? ( vocab -- ? )
     {
-        [ vocab-tags "untested" swap member? ]
+        [ vocab-tags "not loaded" swap member? ]
         [ vocab-platforms supported-platform? not ]
     } 1|| ;
 
+: filter-don't-load ( vocabs -- vocabs' )
+    [ vocab-name don't-load? not ] filter ;
+
+: don't-test? ( vocab -- ? )
+    vocab-tags "not tested" swap member? ;
+
+: filter-don't-test ( vocabs -- vocabs' )
+    [ don't-test? not ] filter ;
+
 TUPLE: unsupported-platform vocab requires ;
 
 : unsupported-platform ( vocab requires -- )