In releasetest.tcl, run larger test first if --jobs is greater than 1. Run

smaller tests cases first if --jobs is 1.

FossilOrigin-Name: 3fece5d02a8790701d8f0af18db4b4db33986369

diff --git a/manifest b/manifest
index 7e80c7f4e7310486fb8d425f72b54d3b9ad71760..60ea716369c5cd93f969e21a5df04c9107f905a7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Exclude\scffault.test\sand\ssymlink.test\sfrom\sthe\s(incompatible)\sinmemory_journal\npermutation.
-D 2015-11-04T13:03:36.598
+C In\sreleasetest.tcl,\srun\slarger\stest\sfirst\sif\s--jobs\sis\sgreater\sthan\s1.\s\sRun\nsmaller\stests\scases\sfirst\sif\s--jobs\sis\s1.
+D 2015-11-04T16:34:58.015
 F Makefile.in 3a705bb4bd12e194212ddbdbf068310d17153cdb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -948,7 +948,7 @@ F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 91014659efa3b3d9befba19d9af8be6345d14af2
+F test/releasetest.tcl c12c4122a7b2ddec16b5f8fb9163f7a008886005
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1398,7 +1398,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a5816877bdc7fae69ed83d1fc95c29bf390eb641
-R 9a7c6a9d73205d2500ddbad7f0038867
+P 4f16e9686d827311d069ac5856771db23bd610ff
+R 98f8295aa06282e70a39acdf3a942e7d
 U drh
-Z 02be6118e54bfa48669e3dd2b1b8b91c
+Z 5331364b3b6f9338e5229c347e8468cf

diff --git a/manifest.uuid b/manifest.uuid
index fff6df1f41b45bc64336436bb9ee94deabfe8332..5e5c1f3a3b08db5adaa7e799c44f82dcf04b0e84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f16e9686d827311d069ac5856771db23bd610ff
\ No newline at end of file
+3fece5d02a8790701d8f0af18db4b4db33986369
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 730ace6cf9bc383337d5d0ad38387c44066bea25..c2fbd0acb3d9a8ed362244f54920b232f3742238 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -231,6 +231,7 @@ array set ::Configs [strip_comments {
 array set ::Platforms [strip_comments {
   Linux-x86_64 {
     "Check-Symbols"           checksymbols
+    "Fast-One"                fuzztest
     "Debug-One"               "mptest test"
     "Have-Not"                test
     "Secure-Delete"           test
@@ -241,10 +242,9 @@ array set ::Platforms [strip_comments {
     "No-lookaside"            test
     "Devkit"                  test
     "Sanitize"                {QUICKTEST_OMIT=func4.test,nan.test test}
-    "Fast-One"                fuzztest
-    "Valgrind"                valgrindtest
-    "Default"                 "threadtest fulltest"
     "Device-One"              fulltest
+    "Default"                 "threadtest fulltest"
+    "Valgrind"                valgrindtest
   }
   Linux-i686 {
     "Devkit"                  test
@@ -265,12 +265,12 @@ array set ::Platforms [strip_comments {
     "OS-X"                    "threadtest fulltest"
   }
   "Windows NT-intel" {
-    "Default"                 "mptest fulltestonly"
     "Have-Not"                test
+    "Default"                 "mptest fulltestonly"
   }
   "Windows NT-amd64" {
-    "Default"                 "mptest fulltestonly"
     "Have-Not"                test
+    "Default"                 "mptest fulltestonly"
   }
 
   # The Failure-Detection platform runs various tests that deliberately
@@ -831,7 +831,15 @@ proc process_options {argv} {
     if {[llength $config]==1} {lappend config fulltest}
     set ::CONFIGLIST $config
   } else {
-    set ::CONFIGLIST $::Platforms($platform)
+    if {$::JOBS>1} {
+      set ::CONFIGLIST {}
+      foreach {target zConfig} [lreverse $::Platforms($platform)] {
+        append ::CONFIGLIST [format "    %-25s %s\n" \
+                               [list $zConfig] [list $target]]
+      }
+    } else {
+      set ::CONFIGLIST $::Platforms($platform)
+    }
   }
   PUTS "Running the following test configurations for $platform:"
   PUTS "    [string trim $::CONFIGLIST]"