aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielk1977 <danielk1977@noemail.net>2005-01-07 10:42:48 +0000
committerdanielk1977 <danielk1977@noemail.net>2005-01-07 10:42:48 +0000
commitd9c847dcd14ff130bee3a1fc82b0cf0f434e00a0 (patch)
treebba1b9aa7d2e808253b7081df0a732a5d1e045c7
parenta3ad5e7d9fffe47acc52362634ba05e6bf83f501 (diff)
downloadsqlite-d9c847dcd14ff130bee3a1fc82b0cf0f434e00a0.tar.gz
sqlite-d9c847dcd14ff130bee3a1fc82b0cf0f434e00a0.zip
Reset the temp_store_directory each iteration of tests in all.test. (CVS 2181)
FossilOrigin-Name: 7373a5d4cf2db921b33132c736ad62ab702d7cde
-rw-r--r--manifest14
-rw-r--r--manifest.uuid2
-rw-r--r--test/all.test7
-rw-r--r--test/pragma.test7
4 files changed, 17 insertions, 13 deletions
diff --git a/manifest b/manifest
index fc112c7b3..88a66417e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sread\sof\sinvalid\smemory\sthat\scould\soccur\sin\sbtree.c.\s(CVS\s2180)
-D 2005-01-07T08:56:44
+C Reset\sthe\stemp_store_directory\seach\siteration\sof\stests\sin\sall.test.\s(CVS\s2181)
+D 2005-01-07T10:42:48
F Makefile.in ecf441ac5ca1ccfc8748a8a9537706e69893dfa4
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -84,7 +84,7 @@ F src/vdbeaux.c a7c4c90786e2633b38f2d89f3dc49aed747454e4
F src/vdbemem.c 5876c8abf4374fef671f4fd8dc333ef3fc95a2f0
F src/where.c 2fc4efc7375eb7f1ae18030311bcd6a18e3a0f46
F tclinstaller.tcl 36478c3bbfc5b93ceac42d94e3c736937b808432
-F test/all.test 853e7030ab20a602eeb7a155124ae37f24ff9ffd
+F test/all.test 8dbfc6e5d0588cd600e347de2839723d9691b099
F test/alter.test 95c57a4f461fa81293e0dccef7f83889aadb169a
F test/attach.test f39069efd4394422798f249df9a31489aa941ee1
F test/attach2.test eeb987770f4dbe68bd29afdbc2e8cff0142e6eb5
@@ -161,7 +161,7 @@ F test/pager.test 394455707a079804e8a4e431d12edce831a065f0
F test/pager2.test 49c0f57c7da0b060f0486b85fdd074025caa694e
F test/pager3.test 647f696a9cf7409df00a1e0047c2eb55585a1b85
F test/pagesize.test 1b826d1608fd86d2303aa895b5586052ad07eba1
-F test/pragma.test 18b3f99853ff694211c2c69567b0a9426e2a5e7a
+F test/pragma.test 6d6f7db667aabd7cfbb57a8daec6022f3eb68400
F test/printf.test 92ba4c510b4fc61120ffa4a01820446ed917ae57
F test/progress.test 5ddba78cb6011fba36093973cfb3ac473b8fb96a x
F test/quick.test 91e5b8ae6663dc9e3e754b271f0384f0cae706e6
@@ -263,7 +263,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746
-P bf14387697459d8d348a35ca50e2ee9407dcf1e1
-R 69691ec0fc90d47f2795ea61e7840061
+P 929745c1833e7f4323884a1bc0c632f5b319da35
+R dba9baec5eebc45c6979e9b7c2efd513
U danielk1977
-Z 5456339343e3dea6f3d7b76699be8b22
+Z 07fbc4827e58bb688700c5382740a556
diff --git a/manifest.uuid b/manifest.uuid
index 76d6b459e..b5d4f4541 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-929745c1833e7f4323884a1bc0c632f5b319da35 \ No newline at end of file
+7373a5d4cf2db921b33132c736ad62ab702d7cde \ No newline at end of file
diff --git a/test/all.test b/test/all.test
index 4c6a749c9..19435161b 100644
--- a/test/all.test
+++ b/test/all.test
@@ -10,7 +10,7 @@
#***********************************************************************
# This file runs all tests.
#
-# $Id: all.test,v 1.23 2005/01/03 01:33:00 drh Exp $
+# $Id: all.test,v 1.24 2005/01/07 10:42:48 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -78,6 +78,11 @@ for {set Counter 0} {$Counter<$COUNT && $nErr==0} {incr Counter} {
if {[info exists Leak]} {
lappend LeakList $Leak
}
+
+ # Reset the sqlite3_temp_directory variable for the next run of tests:
+ sqlite3 db :memory:
+ db eval {PRAGMA temp_store_directory = ""}
+ db close
}
# Do one last test to look for a memory leak in the library. This will
diff --git a/test/pragma.test b/test/pragma.test
index 5bbf178cf..f03d7030e 100644
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
#
# This file implements tests for the PRAGMA command.
#
-# $Id: pragma.test,v 1.28 2004/12/20 19:01:33 tpoindex Exp $
+# $Id: pragma.test,v 1.29 2005/01/07 10:42:48 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -587,10 +587,11 @@ do_test pragma-8.2.15 {
}
} {-450}
+} ; # ifcapable schema_version
+
# Test temp_store and temp_store_directory pragmas
#
-
do_test pragma-9.1 {
db close
sqlite3 db test.db
@@ -661,6 +662,4 @@ do_test pragma-9.10 {
-} ; # ifcapable schema_version
-
finish_test