1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Changes to test scripts so that veryquick.test runs with SQLITE_TEMP_STORE=3 defined. Also a fix to stop the same switch causing a crash in the savepoint code. (CVS 6053)

FossilOrigin-Name: ee0e6eae9f984472e44d7ee8f195c6e5d33f2efd
This commit is contained in:
danielk1977
2008-12-22 11:43:35 +00:00
parent f3107512f7
commit 8a7adb0dc0
5 changed files with 41 additions and 38 deletions

View File

@ -12,7 +12,7 @@
# of these tests is exclusive access mode (i.e. the thing activated by
# "PRAGMA locking_mode = EXCLUSIVE").
#
# $Id: exclusive.test,v 1.10 2008/11/21 00:10:35 aswift Exp $
# $Id: exclusive.test,v 1.11 2008/12/22 11:43:36 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@ -29,15 +29,6 @@ file delete -force test3.db
file delete -force test4.db-journal
file delete -force test4.db
# The locking mode for the TEMP table is always "exclusive" for
# on-disk tables and "normal" for in-memory tables.
#
if {[info exists TEMP_STORE] && $TEMP_STORE>=2} {
set temp_mode normal
} else {
set temp_mode exclusive
}
#----------------------------------------------------------------------
# Test cases exclusive-1.X test the PRAGMA logic.
#
@ -47,7 +38,7 @@ do_test exclusive-1.0 {
pragma main.locking_mode;
pragma temp.locking_mode;
}
} [list normal normal $temp_mode]
} [list normal normal exclusive]
do_test exclusive-1.1 {
execsql {
pragma locking_mode = exclusive;
@ -59,7 +50,7 @@ do_test exclusive-1.2 {
pragma main.locking_mode;
pragma temp.locking_mode;
}
} [list exclusive exclusive $temp_mode]
} [list exclusive exclusive exclusive]
do_test exclusive-1.3 {
execsql {
pragma locking_mode = normal;
@ -71,7 +62,7 @@ do_test exclusive-1.4 {
pragma main.locking_mode;
pragma temp.locking_mode;
}
} [list normal normal $temp_mode]
} [list normal normal exclusive]
do_test exclusive-1.5 {
execsql {
pragma locking_mode = invalid;
@ -83,7 +74,7 @@ do_test exclusive-1.6 {
pragma main.locking_mode;
pragma temp.locking_mode;
}
} [list normal normal $temp_mode]
} [list normal normal exclusive]
ifcapable attach {
do_test exclusive-1.7 {
execsql {
@ -104,7 +95,7 @@ ifcapable attach {
pragma temp.locking_mode;
pragma aux.locking_mode;
}
} [list normal $temp_mode exclusive]
} [list normal exclusive exclusive]
do_test exclusive-1.9 {
execsql {
pragma locking_mode;
@ -140,7 +131,7 @@ ifcapable attach {
pragma aux.locking_mode;
pragma aux2.locking_mode;
}
} [list normal $temp_mode normal normal]
} [list normal exclusive normal normal]
do_test exclusive-1.13 {
execsql {
ATTACH 'test4.db' as aux3;
@ -152,7 +143,7 @@ ifcapable attach {
pragma aux2.locking_mode;
pragma aux3.locking_mode;
}
} [list normal $temp_mode normal normal normal]
} [list normal exclusive normal normal normal]
do_test exclusive-1.99 {
execsql {