Fix the rtree test module so that it works even if the ext/ subfolder is

omitted from the tree. (CVS 6679)

FossilOrigin-Name: 086206e1f51e22ce7b9f45865b370088db126cd2

diff --git a/manifest b/manifest
index 375ac86a15463212078559468c80750258b56d47..b5f473cd38a92d564c4a01c0243c7aa4c6abdcbf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\spinning\sa\stemp\sregister\safter\sit\sis\sreused\sby\sthe\scolumn\scache,\smake\nsure\sall\sinstances\sof\sthat\sregister\sin\sthe\scache\sare\spinned\sso\sthat\sthe\nregister\sis\snever\sreused\sfor\sa\sdifferent\spurpose.\s\sTicket\s#3879.\s(CVS\s6676)
-D 2009-05-25T11:46:29
+C Fix\sthe\srtree\stest\smodule\sso\sthat\sit\sworks\seven\sif\sthe\sext/\ssubfolder\sis\nomitted\sfrom\sthe\stree.\s(CVS\s6679)
+D 2009-05-25T14:17:35
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -511,7 +511,7 @@ F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/rollback.test 1f70ab4301d8d105d41438a436cad1fc8897f5e5
 F test/rowhash.test 97f56043ba11f0679920416c0cdbc72e5272267b
 F test/rowid.test 1c8fc43c60d273e6ea44dfb992db587f3164312c
-F test/rtree.test b85fd4f0861a40ca366ac195e363be2528dcfadf
+F test/rtree.test 55466a200af3591946c5da77ad5dbfbc1e5e05f9
 F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
 F test/savepoint.test 4fc56354c7cd9c6be40d6f18e06ee90d92be0cd9
 F test/savepoint2.test 18f6c75d5c133b93838019df8988b8cdf379d3de
@@ -731,7 +731,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 5b9b66f47b0b8178427806149958387d32b70dc2
-R 750f669592bc4ad4b5798606367d9730
+P 5f358e63712e8de93bd6fecc5131badeef0292be
+R a6c27f16d174fa515fc2d13cfb08fb69
 U drh
-Z 7b464a9202f9fae1b3901cba6c13689b
+Z 246888a53f189c8881cdf3338527c2a3

diff --git a/manifest.uuid b/manifest.uuid
index ff9b301c0d3008b196916b410a8759d8825da1f0..256c2c58ffb796ef674bfd5a141e943baaefcb83 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f358e63712e8de93bd6fecc5131badeef0292be
\ No newline at end of file
+086206e1f51e22ce7b9f45865b370088db126cd2
\ No newline at end of file

diff --git a/test/rtree.test b/test/rtree.test
index eb880af1bda287656a82ad795c2fdc0273b0e207..11f5ab991259504dcda0e0f8b61b825230673c7c 100644 (file)
--- a/test/rtree.test
+++ b/test/rtree.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all rtree related tests.
 #
-# $Id: rtree.test,v 1.2 2008/07/12 14:52:20 drh Exp $
+# $Id: rtree.test,v 1.3 2009/05/25 14:17:35 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -21,7 +21,7 @@ if {[info exists ISQUICK] && $ISQUICK} {
 
 set rtreedir [file join $testdir .. ext rtree]
 
-foreach testfile [lsort -dictionary [glob $rtreedir/*.test]] {
+foreach testfile [lsort -dictionary [glob -nocomplain $rtreedir/*.test]] {
   set tail [file tail $testfile]
   if {[lsearch -exact $RTREE_EXCLUDE $tail]>=0} continue
   source $testfile