Change lock2.test so that it does not enter a busy loop if the child process exists...

FossilOrigin-Name: 164a7f5a45c3e7f7a73899678c374535b270b130

diff --git a/manifest b/manifest
index 995154da6d6ded4981f3dc2ee5178920ea9b954a..1ffe544dfb5fd1da6306fdbd40f48a198657fe34 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sNEVER()\sclause\sfrom\sa\scondition\sthat\sis\strue\sat\sleast\sonce\swhen\srunning\sattachmalloc.test.\s(CVS\s6585)
-D 2009-05-01T06:19:21
+C Change\slock2.test\sso\sthat\sit\sdoes\snot\senter\sa\sbusy\sloop\sif\sthe\schild\sprocess\sexists\sunexpectedly.\s(CVS\s6586)
+D 2009-05-01T10:55:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -436,7 +436,7 @@ F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
 F test/loadext.test 0393ce12d9616aa87597dd0ec88181de181f6db0
 F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
 F test/lock.test edf5585398a33534db71a2a6108308d9e89c16d1
-F test/lock2.test d4f941d1f659e5fc782b4912b1a872d77d4b5470
+F test/lock2.test 7bb642551df59b3de135291d62ee82409420181e
 F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
 F test/lock4.test 991b57669a868bbfd39fe0c0df0d493985829105
 F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
@@ -727,7 +727,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 0256187b512c5849ffae0644e6a42ec0ca2de894
-R 0d590a65bc1ea31caaa79e6209b36379
+P 514efc7312d725c3fe35741e8c000526f3bdb3a6
+R 43434d0b068bdcca53adc3212d1ca6a5
 U danielk1977
-Z 860108b246a9233ecd454fc67c77b178
+Z d1c8ee1cbacb1e40cfb565e00a039418

diff --git a/manifest.uuid b/manifest.uuid
index 0d73204917ef51d799db9bc72dba49f55b1a2d50..6d27b5c6c610fe08547a2260d70d0ac2a54847a9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-514efc7312d725c3fe35741e8c000526f3bdb3a6
\ No newline at end of file
+164a7f5a45c3e7f7a73899678c374535b270b130
\ No newline at end of file

diff --git a/test/lock2.test b/test/lock2.test
index e6c46d39689141bad0c5692d366ccadde0509e72..a2b75ca31122957bd39f46c653ca1a3038977dba 100644 (file)
--- a/test/lock2.test
+++ b/test/lock2.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks between competing processes.
 #
-# $Id: lock2.test,v 1.10 2009/02/05 16:31:46 drh Exp $
+# $Id: lock2.test,v 1.11 2009/05/01 10:55:34 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
@@ -42,6 +42,9 @@ proc testfixture {chan cmd} {
     if { $line == "OVER" } { 
       return $r
     }
+    if {[eof $chan]} {
+      return "ERROR: Child process hung up"
+    }
     append r $line
   }
 }