tools.image-analyzer.*: fix the loading of the .32 and .64 vocabs

[factor.git] / extra / tools / image-analyzer / image-analyzer-tests.factor

diff --git a/extra/tools/image-analyzer/image-analyzer-tests.factor b/extra/tools/image-analyzer/image-analyzer-tests.factor
index c0b5eb44601d61b1a3fda1bf515ff99f85d02da6..bcff120ee2622b379663c66b722fab2210109f1f 100644 (file)
--- a/extra/tools/image-analyzer/image-analyzer-tests.factor
+++ b/extra/tools/image-analyzer/image-analyzer-tests.factor
@@ -2,8 +2,11 @@ USING: accessors bootstrap.image fry grouping io.files io.pathnames kernel
 sequences system tools.deploy.backend tools.image-analyzer tools.test ;
 IN: tools.image-analyzer.tests
 
+: image-path ( arch -- path )
+    boot-image-name resource-path ;
+
 : ?make-image ( arch -- )
-    dup boot-image-name resource-path exists? [ drop ] [ make-image ] if ;
+    dup image-path exists? [ drop ] [ make-image ] if ;
 
 : loadable-images ( -- images )
     images cpu name>> '[ _ tail? ] filter ;
@@ -11,7 +14,7 @@ IN: tools.image-analyzer.tests
 { t } [
     loadable-images [ [ ?make-image ] each ] [
         [
-            boot-image-name resource-path load-image 2drop code-size>>
+            image-path load-image 2drop code-size>>
         ] map [ 0 = ] all?
     ] bi
 ] unit-test