From: dan <dan@noemail.net>
Date: Mon, 29 Nov 2010 18:22:44 +0000 (+0000)
Subject: On *BSD systems, reduce the number of open connections used by wal3.test to avoid... 
X-Git-Tag: version-3.7.4~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=675f85c41cb6ca169a48c8dfef34806c782f305f;p=thirdparty%2Fsqlite.git

On *BSD systems, reduce the number of open connections used by wal3.test to avoid running out of file-descriptors.

FossilOrigin-Name: 0a3cba95a14ae7a24b2d268567a02d651ab278dc
---

diff --git a/manifest b/manifest
index 93cf257c62..c7bcdddb70 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompiler\swarnings\sdiscovered\swhile\sbuilding\sSQLite\son\s[http://www.devio.us/].
-D 2010-11-29T17:55:19
+C On\s*BSD\ssystems,\sreduce\sthe\snumber\sof\sopen\sconnections\sused\sby\swal3.test\sto\savoid\srunning\sout\sof\sfile-descriptors.
+D 2010-11-29T18:22:44
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -829,7 +829,7 @@ F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
 F test/wal.test 70227190e713b3e7eb2a7d5ec3510b66db01f327
 F test/wal2.test 3de797854de175323e7351b5f2514a30d1ee1410
-F test/wal3.test 957a5f2a8fe8a6ff01de1a15285ecf2f376fcaf8
+F test/wal3.test ac51126c36814bce334f66a0a4dbbfa56d429733
 F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
 F test/wal_common.tcl 895d76138043b86bdccf36494054bdabcf65837b
 F test/walbak.test 4df1c7369da0301caeb9a48fa45997fd592380e4
@@ -890,7 +890,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 46b3fbdafe191cd0974cc3f46bc6aa52b3f1270e
-R 94418d1da4fe65366c1a1f528b5cbf20
+P 5602ec95aa2a74d0624bb6c7d53e7a0d35536253
+R 6323c27334aa4baa5510beb33a9bf604
 U dan
-Z 9cee6345784230c66d992ddab0e65ff9
+Z 2046d4f1cadea8b761c8f47a277e38b8
diff --git a/manifest.uuid b/manifest.uuid
index de44cc5bdb..ef500e5b52 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5602ec95aa2a74d0624bb6c7d53e7a0d35536253
\ No newline at end of file
+0a3cba95a14ae7a24b2d268567a02d651ab278dc
\ No newline at end of file
diff --git a/test/wal3.test b/test/wal3.test
index c57132e070..2ed39b8f85 100644
--- a/test/wal3.test
+++ b/test/wal3.test
@@ -703,6 +703,8 @@ T delete
 # the client takes a shared-lock on a slot without modifying the value
 # and continues.
 #
+set nConn 50
+if { [string match *BSD $tcl_platform(os)] } { set nConn 35 }
 do_test wal3-9.0 {
   file delete -force test.db test.db-journal test.db wal
   sqlite3 db test.db
@@ -713,7 +715,7 @@ do_test wal3-9.0 {
     INSERT INTO whoami VALUES('nobody');
   }
 } {wal}
-for {set i 0} {$i < 50} {incr i} {
+for {set i 0} {$i < $nConn} {incr i} {
   set c db$i
   do_test wal3-9.1.$i {
     sqlite3 $c test.db
@@ -724,7 +726,7 @@ for {set i 0} {$i < 50} {incr i} {
     } $c
   } $c
 }
-for {set i 0} {$i < 50} {incr i} {
+for {set i 0} {$i < $nConn} {incr i} {
   set c db$i
   do_test wal3-9.2.$i {
     execsql { SELECT * FROM whoami } $c
@@ -733,12 +735,12 @@ for {set i 0} {$i < 50} {incr i} {
 
 set sz [expr 1024 * (2+$AUTOVACUUM)]
 do_test wal3-9.3 {
-  for {set i 0} {$i < 49} {incr i} { db$i close }
+  for {set i 0} {$i < ($nConn-1)} {incr i} { db$i close }
   execsql { PRAGMA wal_checkpoint } 
   byte_is_zero test.db [expr $sz-1024]
 } {1}
 do_test wal3-9.4 {
-  db49 close
+  db[expr $nConn-1] close
   execsql { PRAGMA wal_checkpoint } 
   set sz2 [file size test.db]
   byte_is_zero test.db [expr $sz-1024]