Tweak deploy tests to take less time

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 723f9461a80436c68781bd7881a55ea279b09667..ae4f6a8d62ad2b9e74250a7957a5dc16a56bab0e 100755 (executable)
--- 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 3d007e566cbd11c1d0f4c2894b17e0f7fa55df2c..acee098b8ff53a22c56cfca37956644fe2d0b72d 100755 (executable)
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -26,7 +26,7 @@ namespaces continuations layouts accessors ;
 \r
 [ t ] [ 1300000 small-enough? ] unit-test\r
 \r
-[ "staging.threads-math-compiler-ui-strip.image" ] [\r
+[ "staging.math-compiler-threads-ui-strip.image" ] [\r
     "hello-ui" deploy-config\r
     [ bootstrap-profile staging-image-name file-name ] bind\r
 ] unit-test\r
@@ -39,9 +39,9 @@ namespaces continuations layouts accessors ;
 ! \r
 ! [ t ] [ 1500000 small-enough? ] unit-test\r
 ! \r
-! [ ] [ "bunny" shake-and-bake ] unit-test\r
-! \r
-! [ t ] [ 2500000 small-enough? ] unit-test\r
+[ ] [ "bunny" shake-and-bake ] unit-test\r
+\r
+[ t ] [ 2500000 small-enough? ] unit-test\r
 \r
 {\r
     "tools.deploy.test.1"\r

diff --git a/basis/tools/deploy/test/1/deploy.factor b/basis/tools/deploy/test/1/deploy.factor
index 098e99719e671b27ac85a67500938cf5e2121d98..6846b3b53e9509ecfdbd11ab0893f7c0d06f5d2a 100755 (executable)
--- 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 c6f46eede66fbd1f18b2429cc6c3633379605e5f..4c34a77b66334e80327bad37bb68995106fed01a 100755 (executable)
--- 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-name "tools.deploy.test.2" }
-    { deploy-compiler? t }
+    { deploy-ui? f }
     { deploy-word-props? f }
-    { deploy-reflection 2 }
     { deploy-word-defs? f }
-    { "stop-after-last-window?" t }
-    { deploy-random? f }
     { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-name "tools.deploy.test.2" }
+    { deploy-compiler? t }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/3/deploy.factor b/basis/tools/deploy/test/3/deploy.factor
index 5f45b87e0d8d07896eed30f21bb5948a1efe3022..84347164b6323b7530003294400b0346c7caef2a 100755 (executable)
--- 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-name "tools.deploy.test.3" }
-    { deploy-compiler? t }
+    { deploy-ui? f }
     { deploy-word-props? f }
-    { deploy-reflection 2 }
     { deploy-word-defs? f }
-    { "stop-after-last-window?" t }
-    { deploy-random? f }
     { deploy-math? t }
+    { deploy-io 3 }
+    { deploy-name "tools.deploy.test.3" }
+    { deploy-compiler? t }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/4/deploy.factor b/basis/tools/deploy/test/4/deploy.factor
index ea899e64c08af59b222041a3315c16031b117421..b1a6736bde603cd554cd9f3fd44698fb0e2d2e9e 100644 (file)
--- 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-name "tools.deploy.test.4" }
-    { deploy-compiler? t }
+    { deploy-ui? f }
     { deploy-word-props? f }
-    { deploy-reflection 2 }
     { deploy-word-defs? f }
-    { "stop-after-last-window?" t }
-    { deploy-random? f }
     { deploy-math? t }
+    { deploy-io 2 }
+    { deploy-name "tools.deploy.test.4" }
+    { deploy-compiler? t }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/5/deploy.factor b/basis/tools/deploy/test/5/deploy.factor
index 797116e09b84559f2ccbc5866dd86774bf044ea9..f5f8bc035291fbe5bb54cf46db0f6ce3915ebe59 100644 (file)
--- 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-name "tools.deploy.test.5" }
-    { deploy-compiler? t }
+    { deploy-ui? f }
     { deploy-word-props? f }
-    { deploy-reflection 2 }
     { deploy-word-defs? f }
-    { "stop-after-last-window?" t }
-    { deploy-random? f }
     { deploy-math? t }
+    { deploy-io 3 }
+    { deploy-name "tools.deploy.test.5" }
+    { deploy-compiler? t }
+    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
 }