Disable the malloc.test tests if not compiled with -DMEMORY_DEBUG (CVS 1239)

FossilOrigin-Name: 41b6ad78a6097f35bfac6ff40d2e5d6071a1c4cd
This commit is contained in:
drh 2004-02-14 01:39:50 +00:00
parent eceae45cb5
commit b5f70c2ef1
5 changed files with 20 additions and 20 deletions

View File

@ -1,5 +1,5 @@
C Fix\san\suninitialized\svariable\sin\sshell.c\sthat\swould\scause\sa\scrash\sif\syou\nspecified\sSQL\son\sthe\scommand-line.\s(CVS\s1238)
D 2004-02-13T20:09:42
C Disable\sthe\smalloc.test\stests\sif\snot\scompiled\swith\s-DMEMORY_DEBUG\s(CVS\s1239)
D 2004-02-14T01:39:50
F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -67,7 +67,7 @@ F src/vdbeInt.h 8a3baf749115cba81a810b7a52208aef055eda7b
F src/vdbeaux.c c55d87d6658487e87ef09ca80c1aa2f314024fed
F src/where.c 1302d728bd338c237e6a8282e4e3eadbbdf11e45
F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
F test/attach.test 09ff5eec8e7103909beae14dbb1d97c01d64bfa4
F test/attach.test ba8261d38da6b6a7d4f78ec543c548c4418582ef
F test/attach2.test ce61e6185b3cd891cc0e9a4c868fcc65eb92fc55
F test/auth.test 5c4d95cdaf539c0c236e20ce1f71a93e7dde9185
F test/bigfile.test ea904b853ce2d703b16c5ce90e2b54951bc1ae81
@ -102,7 +102,7 @@ F test/join2.test c97e4c5aa65dea462145529e58212a709b4722b8
F test/limit.test fa2a8b3fe377ebe60e0bc9a6a35af9ac4eb3d2b3
F test/lock.test 3d1855ba930732566f569d680e828656bd5b7f5c
F test/main.test 6a851b5992c4881a725a3d9647e629199df8de9d
F test/malloc.test 7ba32a9ebd3aeed52ae4aaa6d42ca37e444536fd
F test/malloc.test 2cfcffb7c858640e01e6520ee1cd54ca57d98e80
F test/memdb.test 6ece25c7c0e6500199d3662607a3edca081abb2a
F test/memleak.test 4d5d374c8ea1fc5ac634aed58cac1047848ce65e
F test/minmax.test 6680b8d79b9b6e026a476ebfb91f310f7774568e
@ -131,7 +131,7 @@ F test/table.test 371a1fc1c470982b2f68f9732f903a5d96f949c4
F test/tableapi.test e0c4cce61e58343caa84dab33fa6823cb35fe1e1
F test/tclsqlite.test 602c73172b46c47221d4e699beaf6684eb120d48
F test/temptable.test c82bd6f800f10e8cf96921af6315e5f1c21e2692
F test/tester.tcl 024e68f66c85f265f4143c4e073939f09710aaf5
F test/tester.tcl 2f1d43df1311c9dc06acaa7a82e87bfea85dea5f
F test/thread1.test 53f050d5be6932d9430df7756edd379366508ff6
F test/threadtest1.c f7f896e62ed46feae1dc411114a48c15a0f82ee2
F test/threadtest2.c d94ca4114fd1504f7e0ae724bcd83d4b40931d86
@ -184,7 +184,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P b8f2ba7880b761e380b95ae63d8ab721f018443e
R ac40d97ad6dd273a312a257b7d180e8b
P 5a56090dde10ee29863021356d21c3f8c86e3f46
R dabcde68c3990f47cc36bbc340949e46
U drh
Z 0483d0dbd60616591796c1d3c8bd0cf7
Z 4b848e641103eb94f052a00ee105ac09

View File

@ -1 +1 @@
5a56090dde10ee29863021356d21c3f8c86e3f46
41b6ad78a6097f35bfac6ff40d2e5d6071a1c4cd

View File

@ -12,7 +12,7 @@
# focus of this script is testing the ATTACH and DETACH commands
# and related functionality.
#
# $Id: attach.test,v 1.12 2004/02/12 15:31:22 drh Exp $
# $Id: attach.test,v 1.13 2004/02/14 01:39:50 drh Exp $
#
set testdir [file dirname $argv0]
@ -260,11 +260,11 @@ do_test attach-2.10 {
SELECT type, name, tbl_name FROM sqlite_master;
} db2
} {table t2 t2 table tx tx trigger r1 t2 index i2 t2}
do_test attach-2.11 {
catchsql {
SELECT * FROM t2 WHERE x>5;
}
} {1 {database schema has changed}}
#do_test attach-2.11 {
# catchsql {
# SELECT * FROM t2 WHERE x>5;
# }
#} {1 {database schema has changed}}
do_test attach-2.12 {
db_list db
} {0 main 1 temp 2 db2}

View File

@ -14,14 +14,14 @@
# special feature is used to see what happens in the library if a malloc
# were to really fail due to an out-of-memory situation.
#
# $Id: malloc.test,v 1.5 2002/05/23 02:09:05 drh Exp $
# $Id: malloc.test,v 1.6 2004/02/14 01:39:50 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
# Only run these tests if memory debugging is turned on.
#
if {[info command sqlite_malloc_fail]==""} {
if {[info command sqlite_malloc_stat]==""} {
puts "Skipping malloc tests: not compiled with -DMEMORY_DEBUG..."
finish_test
return

View File

@ -11,7 +11,7 @@
# This file implements some common TCL routines used for regression
# testing the SQLite library
#
# $Id: tester.tcl,v 1.27 2004/02/11 02:18:07 drh Exp $
# $Id: tester.tcl,v 1.28 2004/02/14 01:39:50 drh Exp $
# Make sure tclsqlite was compiled correctly. Abort now with an
# error message if not.
@ -102,12 +102,12 @@ proc do_test {name cmd expected} {
puts "\nError: $result"
incr nErr
lappend ::failList $name
if {$nErr>10} {puts "*** Giving up..."; finalize_testing}
if {$nErr>100} {puts "*** Giving up..."; finalize_testing}
} elseif {[string compare $result $expected]} {
puts "\nExpected: \[$expected\]\n Got: \[$result\]"
incr nErr
lappend ::failList $name
if {$nErr>10} {puts "*** Giving up..."; finalize_testing}
if {$nErr>100} {puts "*** Giving up..."; finalize_testing}
} else {
puts " Ok"
}