From 775ca0a95647db832105fa163166e45d34076a7a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 3 Apr 2009 16:30:59 -0500
Subject: [PATCH] mason: run factor.com on windows

---
 extra/mason/child/child-tests.factor | 8 ++++++++
 extra/mason/child/child.factor       | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/extra/mason/child/child-tests.factor b/extra/mason/child/child-tests.factor
index 104360e1fa..27bb42ed07 100644
--- a/extra/mason/child/child-tests.factor
+++ b/extra/mason/child/child-tests.factor
@@ -32,3 +32,11 @@ USING: mason.child mason.config tools.test namespaces ;
         boot-cmd
     ] with-scope
 ] unit-test
+
+[ { "./factor.com" "-i=boot.x86.32.image" "-no-user-init" } ] [
+    [
+        "winnt" target-os set
+        "x86.32" target-cpu set
+        boot-cmd
+    ] with-scope
+] unit-test
diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor
index 2ed9226524..feb11933fb 100755
--- a/extra/mason/child/child.factor
+++ b/extra/mason/child/child.factor
@@ -25,8 +25,11 @@ IN: mason.child
     builds-factor-image "." copy-file-into
     builds-factor-image "factor" copy-file-into ;
 
+: factor-vm ( -- string )
+    target-os get "winnt" = "./factor.com" "./factor" ? ;
+
 : boot-cmd ( -- cmd )
-    "./factor"
+    factor-vm
     "-i=" boot-image-name append
     "-no-user-init"
     3array ;
@@ -42,7 +45,7 @@ IN: mason.child
         try-process
     ] with-directory ;
 
-: test-cmd ( -- cmd ) { "./factor" "-run=mason.test" } ;
+: test-cmd ( -- cmd ) factor-vm "-run=mason.test" 2array ;
 
 : test ( -- )
     "factor" [