Fix releasetest.tcl so that it does not choke if a test fails so badly that there...

FossilOrigin-Name: 20e96f521fce12ffeb6be788e57bce88f287cff5

diff --git a/manifest b/manifest
index 618eceeab185a606b46d61e968403755502d8024..d94eb68db7001dca56dc5afd62b617e4e5cedfdf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sreleasetest.tcl\sso\sthat\soutput\slines\sare\sless\sthan\s80\scharacters\swide.
-D 2015-11-02T20:24:29.534
+C Fix\sreleasetest.tcl\sso\sthat\sit\sdoes\snot\schoke\sif\sa\stest\sfails\sso\sbadly\sthat\sthere\sis\sno\slog\sfile.\sAdd\sthe\s--jobs\sswitch\sto\sthe\susage\smessage.
+D 2015-11-02T20:28:48.981
 F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
 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 3ab9971e63b86dd3601e15d7df5ab95ebcd59830
+F test/releasetest.tcl 298556d91ee49375cf87c3c899483f50d4722a07
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1397,7 +1397,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 3d29f912cb7c6ee3e4903b1b14dd7ae82e4d02b1
-R 505a39a0f41499b686ed80eb068a99d4
+P aef177fef049f9ffb0d138b947326dc0186b1f4f
+R 8b650d0156c14e56fe1cf3974aba955d
 U dan
-Z 2e77fe00dc901cf4f51390d5b829205a
+Z d28db9d91dacdee58d844fe7129a20ae

diff --git a/manifest.uuid b/manifest.uuid
index af60eda520aa240508febc7bfb6c81aa4aaec32b..d5cc1bbeb0133f95bedc80eef4bbf0963c04a216 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aef177fef049f9ffb0d138b947326dc0186b1f4f
\ No newline at end of file
+20e96f521fce12ffeb6be788e57bce88f287cff5
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index d81ef09e1228ec30da8ad08b8bc7cc185d75fcde..b8e6c74156ccacfb8938e5f0f2010e51b7eeea43 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -19,6 +19,7 @@ optional) are:
     --dryrun                           (Print what would have happened)
     --info                             (Show diagnostic info)
     --with-tcl=DIR                     (Use TCL build at DIR)
+    --jobs     N                       (Use N processes - default 1)
 
 The default value for --srcdir is the parent of the directory holding
 this script.
@@ -443,7 +444,13 @@ proc slave_fileevent {fd T tm1} {
     set rc [catch { close $fd }]
 
     set errmsg {}
-    count_tests_and_errors [file join $dir test.log] rc errmsg
+    set logfile [file join $dir test.log]
+    if {[file exists $logfile]} {
+      count_tests_and_errors [file join $dir test.log] rc errmsg
+    } elseif {$rc==0} {
+      set rc 1
+      set errmsg "no test.log file..."
+    }
 
     if {!$::TRACE} {
       set tm2 [clock seconds]