From cff700cd3ef6e552191baa63bf97fab8cfeebb73 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 13 Mar 2009 19:41:13 -0500
Subject: [PATCH] Add tests to ensure that execute( and regexps work when
 deployed

---
 basis/tools/deploy/deploy-tests.factor   | 43 ++++++++----------------
 basis/tools/deploy/test/12/12.factor     | 10 ++++++
 basis/tools/deploy/test/12/authors.txt   |  1 +
 basis/tools/deploy/test/12/deploy.factor | 15 +++++++++
 basis/tools/deploy/test/13/13.factor     | 10 ++++++
 basis/tools/deploy/test/13/authors.txt   |  1 +
 basis/tools/deploy/test/13/deploy.factor | 15 +++++++++
 7 files changed, 66 insertions(+), 29 deletions(-)
 create mode 100644 basis/tools/deploy/test/12/12.factor
 create mode 100644 basis/tools/deploy/test/12/authors.txt
 create mode 100644 basis/tools/deploy/test/12/deploy.factor
 create mode 100644 basis/tools/deploy/test/13/13.factor
 create mode 100644 basis/tools/deploy/test/13/authors.txt
 create mode 100644 basis/tools/deploy/test/13/deploy.factor

diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 0dea093081..40c4ae5721 100644
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -80,32 +80,17 @@ M: quit-responder call-responder*
 
 [ ] [ "http://localhost/quit" add-port http-get 2drop ] unit-test
 
-[ ] [
-    "tools.deploy.test.6" shake-and-bake
-    run-temp-image
-] unit-test
-
-[ ] [
-    "tools.deploy.test.7" shake-and-bake
-    run-temp-image
-] unit-test
-
-[ ] [
-    "tools.deploy.test.8" shake-and-bake
-    run-temp-image
-] unit-test
-
-[ ] [
-    "tools.deploy.test.9" shake-and-bake
-    run-temp-image
-] unit-test
-
-[ ] [
-    "tools.deploy.test.10" shake-and-bake
-    run-temp-image
-] unit-test
-
-[ ] [
-    "tools.deploy.test.11" shake-and-bake
-    run-temp-image
-] unit-test
\ No newline at end of file
+{
+    "tools.deploy.test.6"
+    "tools.deploy.test.7"
+    "tools.deploy.test.8"
+    "tools.deploy.test.9"
+    "tools.deploy.test.10"
+    "tools.deploy.test.11"
+    "tools.deploy.test.12"
+} [
+    [ ] swap [
+        shake-and-bake
+        run-temp-image
+    ] curry unit-test
+] each
\ No newline at end of file
diff --git a/basis/tools/deploy/test/12/12.factor b/basis/tools/deploy/test/12/12.factor
new file mode 100644
index 0000000000..3ee0643c38
--- /dev/null
+++ b/basis/tools/deploy/test/12/12.factor
@@ -0,0 +1,10 @@
+! Copyright (C) 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: call math.parser io math ;
+IN: tools.deploy.test.12
+
+: execute-test ( a b w -- c ) execute( a b -- c ) ;
+
+: foo ( -- ) 1 2 \ + execute-test number>string print ;
+
+MAIN: foo
\ No newline at end of file
diff --git a/basis/tools/deploy/test/12/authors.txt b/basis/tools/deploy/test/12/authors.txt
new file mode 100644
index 0000000000..d4f5d6b3ae
--- /dev/null
+++ b/basis/tools/deploy/test/12/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
\ No newline at end of file
diff --git a/basis/tools/deploy/test/12/deploy.factor b/basis/tools/deploy/test/12/deploy.factor
new file mode 100644
index 0000000000..638e1ca000
--- /dev/null
+++ b/basis/tools/deploy/test/12/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-c-types? f }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
+    { deploy-word-props? f }
+    { deploy-math? f }
+    { deploy-unicode? f }
+    { deploy-io 2 }
+    { deploy-ui? f }
+    { deploy-name "tools.deploy.test.12" }
+    { deploy-compiler? f }
+    { deploy-word-defs? f }
+    { deploy-threads? f }
+}
diff --git a/basis/tools/deploy/test/13/13.factor b/basis/tools/deploy/test/13/13.factor
new file mode 100644
index 0000000000..af7cb4e6d5
--- /dev/null
+++ b/basis/tools/deploy/test/13/13.factor
@@ -0,0 +1,10 @@
+! Copyright (C) 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: regexp kernel io ;
+IN: tools.deploy.test.13
+
+: regexp-test ( a -- b ) <regexp> "xyz" swap matches? ;
+
+: main ( -- ) "x.z" regexp-test "X" "Y" ? print ;
+
+MAIN: main
\ No newline at end of file
diff --git a/basis/tools/deploy/test/13/authors.txt b/basis/tools/deploy/test/13/authors.txt
new file mode 100644
index 0000000000..d4f5d6b3ae
--- /dev/null
+++ b/basis/tools/deploy/test/13/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
\ No newline at end of file
diff --git a/basis/tools/deploy/test/13/deploy.factor b/basis/tools/deploy/test/13/deploy.factor
new file mode 100644
index 0000000000..9513192311
--- /dev/null
+++ b/basis/tools/deploy/test/13/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-threads? t }
+    { deploy-compiler? t }
+    { deploy-math? t }
+    { deploy-io 2 }
+    { "stop-after-last-window?" t }
+    { deploy-c-types? f }
+    { deploy-name "tools.deploy.test.13" }
+    { deploy-word-props? f }
+    { deploy-unicode? f }
+    { deploy-word-defs? f }
+    { deploy-reflection 4 }
+    { deploy-ui? f }
+}