From beccf83f7ccb81ddf35f025d22450b8ae51bbca5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 18 Jun 2008 22:29:48 -0500
Subject: [PATCH] Fix deploy tests

---
 extra/tools/deploy/deploy-tests.factor  | 22 +++++++++++++---------
 extra/tools/deploy/test/3/3.factor      |  5 ++---
 extra/tools/deploy/test/4/4.factor      |  7 +++++++
 extra/tools/deploy/test/4/deploy.factor | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 extra/tools/deploy/test/4/4.factor
 create mode 100644 extra/tools/deploy/test/4/deploy.factor

diff --git a/extra/tools/deploy/deploy-tests.factor b/extra/tools/deploy/deploy-tests.factor
index 8ff22fb1ad..5309784b7c 100755
--- a/extra/tools/deploy/deploy-tests.factor
+++ b/extra/tools/deploy/deploy-tests.factor
@@ -49,12 +49,16 @@ namespaces continuations layouts accessors ;
     cell 8 = 50 30 ? 100000 * small-enough?
 ] unit-test
 
-[ ] [
-    "tools.deploy.test.1" shake-and-bake
-    vm "-i=" "test.image" temp-file append 2array try-process
-] unit-test
-
-[ ] [
-    "tools.deploy.test.2" shake-and-bake
-    vm "-i=" "test.image" temp-file append 2array try-process
-] unit-test
+{
+    "tools.deploy.test.1"
+    "tools.deploy.test.2"
+    "tools.deploy.test.3"
+    "tools.deploy.test.4"
+} [
+    [ ] swap [
+        shake-and-bake
+        vm
+        "-i=" "test.image" temp-file append
+        2array try-process
+    ] curry unit-test
+] each
diff --git a/extra/tools/deploy/test/3/3.factor b/extra/tools/deploy/test/3/3.factor
index 69287db4e2..5919fa15db 100755
--- a/extra/tools/deploy/test/3/3.factor
+++ b/extra/tools/deploy/test/3/3.factor
@@ -1,8 +1,7 @@
 IN: tools.deploy.test.3
-USING: io.encodings.ascii io.files kernel ;
+USING: io.encodings.ascii io.encodings.string system kernel ;
 
 : deploy-test-3 ( -- )
-    "resource:extra/tools/deploy/test/3/3.factor"
-    ascii file-contents drop ;
+    "xyzthg" ascii encode drop ;
 
 MAIN: deploy-test-3
diff --git a/extra/tools/deploy/test/4/4.factor b/extra/tools/deploy/test/4/4.factor
new file mode 100644
index 0000000000..6831eae5d3
--- /dev/null
+++ b/extra/tools/deploy/test/4/4.factor
@@ -0,0 +1,7 @@
+IN: tools.deploy.test.4
+USING: io.encodings.8-bit io.encodings.string kernel ;
+
+: deploy-test-4 ( -- )
+    "xyzthg" latin7 encode drop ;
+
+MAIN: deploy-test-4
diff --git a/extra/tools/deploy/test/4/deploy.factor b/extra/tools/deploy/test/4/deploy.factor
new file mode 100644
index 0000000000..5250ad698a
--- /dev/null
+++ b/extra/tools/deploy/test/4/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-math? f }
+    { deploy-ui? f }
+    { deploy-compiler? t }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { deploy-io 2 }
+    { deploy-name "tools.deploy.test.4" }
+    { deploy-c-types? f }
+    { deploy-random? f }
+    { "stop-after-last-window?" t }
+    { deploy-threads? t }
+    { deploy-reflection 1 }
+}