From 0691bde5446d346a7234d2119d7859a9fbf2f6fd Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 7 Sep 2008 21:32:06 -0500
Subject: [PATCH] Tweak deploy tests to take less time

---
 basis/tools/deploy/backend/backend.factor |  2 +-
 basis/tools/deploy/deploy-tests.factor    |  8 ++++----
 basis/tools/deploy/test/1/deploy.factor   | 16 ++++++++--------
 basis/tools/deploy/test/2/deploy.factor   | 14 +++++++-------
 basis/tools/deploy/test/3/deploy.factor   | 14 +++++++-------
 basis/tools/deploy/test/4/deploy.factor   | 14 +++++++-------
 basis/tools/deploy/test/5/deploy.factor   | 14 +++++++-------
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 723f9461a8..ae4f6a8d62 100755
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -42,9 +42,9 @@ IN: tools.deploy.backend
 
 : bootstrap-profile ( -- profile )
     {
-        { "threads"  deploy-threads?  }
         { "math"     deploy-math?     }
         { "compiler" deploy-compiler? }
+        { "threads"  deploy-threads?  }
         { "ui"       deploy-ui?       }
         { "random"   deploy-random?   }
     } [ nip get ] assoc-filter keys
diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 3d007e566c..acee098b8f 100755
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -26,7 +26,7 @@ namespaces continuations layouts accessors ;
 
 [ t ] [ 1300000 small-enough? ] unit-test
 
-[ "staging.threads-math-compiler-ui-strip.image" ] [
+[ "staging.math-compiler-threads-ui-strip.image" ] [
     "hello-ui" deploy-config
     [ bootstrap-profile staging-image-name file-name ] bind
 ] unit-test
@@ -39,9 +39,9 @@ namespaces continuations layouts accessors ;
 ! 
 ! [ t ] [ 1500000 small-enough? ] unit-test
 ! 
-! [ ] [ "bunny" shake-and-bake ] unit-test
-! 
-! [ t ] [ 2500000 small-enough? ] unit-test
+[ ] [ "bunny" shake-and-bake ] unit-test
+
+[ t ] [ 2500000 small-enough? ] unit-test
 
 {
     "tools.deploy.test.1"
diff --git a/basis/tools/deploy/test/1/deploy.factor b/basis/tools/deploy/test/1/deploy.factor
index 098e99719e..6846b3b53e 100755
--- a/basis/tools/deploy/test/1/deploy.factor
+++ b/basis/tools/deploy/test/1/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-c-types? f }
-    { deploy-name "tools.deploy.test.1" }
-    { deploy-io 2 }
-    { deploy-random? f }
-    { deploy-math? t }
-    { deploy-compiler? t }
-    { deploy-reflection 2 }
-    { "stop-after-last-window?" t }
     { deploy-threads? t }
+    { deploy-random? f }
+    { deploy-c-types? f }
     { deploy-ui? f }
     { deploy-word-props? f }
     { deploy-word-defs? f }
+    { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-name "tools.deploy.test.1" }
+    { deploy-compiler? t }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
 }
diff --git a/basis/tools/deploy/test/2/deploy.factor b/basis/tools/deploy/test/2/deploy.factor
index c6f46eede6..4c34a77b66 100755
--- a/basis/tools/deploy/test/2/deploy.factor
+++ b/basis/tools/deploy/test/2/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-io 2 }
-    { deploy-ui? f }
     { deploy-threads? t }
+    { deploy-random? f }
     { deploy-c-types? f }
+    { deploy-ui? f }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { deploy-math? t }
+    { deploy-io 2 }
     { deploy-name "tools.deploy.test.2" }
     { deploy-compiler? t }
-    { deploy-word-props? f }
-    { deploy-reflection 2 }
-    { deploy-word-defs? f }
+    { deploy-reflection 1 }
     { "stop-after-last-window?" t }
-    { deploy-random? f }
-    { deploy-math? t }
 }
diff --git a/basis/tools/deploy/test/3/deploy.factor b/basis/tools/deploy/test/3/deploy.factor
index 5f45b87e0d..84347164b6 100755
--- a/basis/tools/deploy/test/3/deploy.factor
+++ b/basis/tools/deploy/test/3/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-io 3 }
-    { deploy-ui? f }
     { deploy-threads? t }
+    { deploy-random? f }
     { deploy-c-types? f }
+    { deploy-ui? f }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { deploy-math? t }
+    { deploy-io 3 }
     { deploy-name "tools.deploy.test.3" }
     { deploy-compiler? t }
-    { deploy-word-props? f }
-    { deploy-reflection 2 }
-    { deploy-word-defs? f }
+    { deploy-reflection 1 }
     { "stop-after-last-window?" t }
-    { deploy-random? f }
-    { deploy-math? t }
 }
diff --git a/basis/tools/deploy/test/4/deploy.factor b/basis/tools/deploy/test/4/deploy.factor
index ea899e64c0..b1a6736bde 100644
--- a/basis/tools/deploy/test/4/deploy.factor
+++ b/basis/tools/deploy/test/4/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-io 2 }
-    { deploy-ui? f }
     { deploy-threads? t }
+    { deploy-random? f }
     { deploy-c-types? f }
+    { deploy-ui? f }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { deploy-math? t }
+    { deploy-io 2 }
     { deploy-name "tools.deploy.test.4" }
     { deploy-compiler? t }
-    { deploy-word-props? f }
-    { deploy-reflection 2 }
-    { deploy-word-defs? f }
+    { deploy-reflection 1 }
     { "stop-after-last-window?" t }
-    { deploy-random? f }
-    { deploy-math? t }
 }
diff --git a/basis/tools/deploy/test/5/deploy.factor b/basis/tools/deploy/test/5/deploy.factor
index 797116e09b..f5f8bc0352 100644
--- a/basis/tools/deploy/test/5/deploy.factor
+++ b/basis/tools/deploy/test/5/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-io 3 }
-    { deploy-ui? f }
     { deploy-threads? t }
+    { deploy-random? f }
     { deploy-c-types? f }
+    { deploy-ui? f }
+    { deploy-word-props? f }
+    { deploy-word-defs? f }
+    { deploy-math? t }
+    { deploy-io 3 }
     { deploy-name "tools.deploy.test.5" }
     { deploy-compiler? t }
-    { deploy-word-props? f }
-    { deploy-reflection 2 }
-    { deploy-word-defs? f }
+    { deploy-reflection 1 }
     { "stop-after-last-window?" t }
-    { deploy-random? f }
-    { deploy-math? t }
 }