Add tests to ensure that execute( and regexps work when deployed

diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 0dea093081d499607201b24d1dfd13e233f9b5b0..40c4ae57215376471bda83ae39bab4b560911ad7 100644 (file)
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -80,32 +80,17 @@ M: quit-responder call-responder*
 \r
 [ ] [ "http://localhost/quit" add-port http-get 2drop ] unit-test\r
 \r
-[ ] [\r
-    "tools.deploy.test.6" shake-and-bake\r
-    run-temp-image\r
-] unit-test\r
-\r
-[ ] [\r
-    "tools.deploy.test.7" shake-and-bake\r
-    run-temp-image\r
-] unit-test\r
-\r
-[ ] [\r
-    "tools.deploy.test.8" shake-and-bake\r
-    run-temp-image\r
-] unit-test\r
-\r
-[ ] [\r
-    "tools.deploy.test.9" shake-and-bake\r
-    run-temp-image\r
-] unit-test\r
-\r
-[ ] [\r
-    "tools.deploy.test.10" shake-and-bake\r
-    run-temp-image\r
-] unit-test\r
-\r
-[ ] [\r
-    "tools.deploy.test.11" shake-and-bake\r
-    run-temp-image\r
-] unit-test
\ No newline at end of file
+{\r
+    "tools.deploy.test.6"\r
+    "tools.deploy.test.7"\r
+    "tools.deploy.test.8"\r
+    "tools.deploy.test.9"\r
+    "tools.deploy.test.10"\r
+    "tools.deploy.test.11"\r
+    "tools.deploy.test.12"\r
+} [\r
+    [ ] swap [\r
+        shake-and-bake\r
+        run-temp-image\r
+    ] curry unit-test\r
+] 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 (file)
index 0000000..3ee0643
--- /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 (file)
index 0000000..d4f5d6b
--- /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 (file)
index 0000000..638e1ca
--- /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 (file)
index 0000000..af7cb4e
--- /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 (file)
index 0000000..d4f5d6b
--- /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 (file)
index 0000000..9513192
--- /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 }
+}