A few minor changes to test scripts so that they work on linux-amd64. (CVS 5752)

FossilOrigin-Name: 78d075ff38d96cc58659a7097dec0e49402aa960

diff --git a/manifest b/manifest
index 9f8f403871f1bef191900615596dfbc40780561f..a53a9434ca9c5c4b8d18553fe8538bf9a818cfa9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sreparentPage()\sand\sreparentChildPages()\sfunctions\sfrom\sbtree.c.\sAll\scalls\sto\sthese\sfunctions\scan\snow\sbe\sreplaced\sby\sa\scall\sto\ssetChildPtrmaps().\s(CVS\s5751)
-D 2008-09-29T16:41:32
+C A\sfew\sminor\schanges\sto\stest\sscripts\sso\sthat\sthey\swork\son\slinux-amd64.\s(CVS\s5752)
+D 2008-09-30T00:31:38
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -403,7 +403,7 @@ F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
 F test/lock5.test 904c20aec51d5dbff0a3aec6a4d35c5ae0257449
-F test/lookaside.test 8866ea41301d74993423c99e523322fca09c259e
+F test/lookaside.test 28f730199350f3912c122c23bab2f01910530c84
 F test/main.test 187a9a1b5248ed74a83838c581c15ec6023b555b
 F test/malloc.test 6ff6063f750d30741bc6d8c01b6ae5f94f5cf6f6
 F test/malloc3.test 094f8195fe8e409bd4da0f1d769f7745faec62c8
@@ -427,7 +427,7 @@ F test/malloc_common.tcl 984baeb6c6b185e798827d1187d426acc2bc4962
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test c12d1e4ad7f0ec7a45b56b5c49fe7397fa8d6d8f
+F test/memsubsys1.test 966f413d30875121f6decd72a920d6f34069a0c0
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -637,7 +637,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 7354abd03be756b1d7d0a3d5b8958f5c0c985ff5
-R 0f06dc556542affcd1339888998b5de0
-U danielk1977
-Z 09ed030904a23d22068a2c20cf1cad6c
+P 35e8e4dcd24b050b535ae005ca3b25e6a673eb89
+R 9074d4b98a3d572c308fa30be3a7f773
+U drh
+Z fbd675315e0378308c18a28ef87a5133

diff --git a/manifest.uuid b/manifest.uuid
index 7053f9004db656309b0ecda3af4f39d67b7628b2..5f25a7790628b69a23e93425858a6561a6fdeb27 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-35e8e4dcd24b050b535ae005ca3b25e6a673eb89
\ No newline at end of file
+78d075ff38d96cc58659a7097dec0e49402aa960
\ No newline at end of file

diff --git a/test/lookaside.test b/test/lookaside.test
index 5c7b2f721db2061886ea029249867befde744372..76b9bf169c3b70da6cacf9a59e6023edabf7748f 100644 (file)
--- a/test/lookaside.test
+++ b/test/lookaside.test
@@ -11,7 +11,7 @@
 #
 # Tests for the lookaside memory allocator.
 #
-# $Id: lookaside.test,v 1.5 2008/08/12 15:48:25 drh Exp $
+# $Id: lookaside.test,v 1.6 2008/09/30 00:31:38 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -29,7 +29,7 @@ do_test lookaside-1.1 {
   catch {sqlite3_config_error db}
 } {0}
 do_test lookaside-1.2 {
-  sqlite3_db_config_lookaside db 1 20 20
+  sqlite3_db_config_lookaside db 1 18 18
 } {0}
 do_test lookaside-1.3 {
   sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0
@@ -37,25 +37,25 @@ do_test lookaside-1.3 {
 do_test lookaside-1.4 {
   db eval {CREATE TABLE t1(w,x,y,z);}
   foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
-  expr {$x==0 && $y<$z && $z==20}
+  expr {$x==0 && $y<$z && $z==18}
 } {1}
 do_test lookaside-1.5 {
   foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1] break
-  expr {$x==0 && $y<$z && $z==20}
+  expr {$x==0 && $y<$z && $z==18}
 } {1}
 do_test lookaside-1.6 {
   foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
-  expr {$x==0 && $y==$z && $y<20}
+  expr {$x==0 && $y==$z && $y<18}
 } {1}
 do_test lookaside-1.7 {
   db cache flush
   foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 0] break
-  expr {$x==0 && $y==0 && $z<20}
+  expr {$x==0 && $y==0 && $z<18}
 } {1}
 do_test lookaside-1.8 {
   db cache flush
   foreach {x y z} [sqlite3_db_status db SQLITE_DBSTATUS_LOOKASIDE_USED 1] break
-  expr {$x==0 && $y==0 && $z<20}
+  expr {$x==0 && $y==0 && $z<18}
 } {1}
 do_test lookaside-1.9 {
   db cache flush

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 32fa873fa453e46a877ece6311396ed23778c3b8..1b1e5a56bad981e45622837246251d1e4a05d974 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -11,7 +11,7 @@
 #
 # This file contains tests of the memory allocation subsystem
 #
-# $Id: memsubsys1.test,v 1.11 2008/08/26 18:05:48 danielk1977 Exp $
+# $Id: memsubsys1.test,v 1.12 2008/09/30 00:31:38 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -210,7 +210,7 @@ do_test memsubsys1-6.3 {
 } 23
 do_test memsubsys1-6.4 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-  expr {$maxreq>4096 && $maxreq<(4096+$xtra_size)}
+  expr {$maxreq>4096 && $maxreq<=(4096+$xtra_size)}
 } 1
 do_test memsubsys1-6.5 {
   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]