From cf77a45a100d9252c6c5090c71b0af08bda800f6 Mon Sep 17 00:00:00 2001 From: shane Date: Mon, 19 May 2008 20:11:39 +0000 Subject: [PATCH] SQLite stores native file names and paths for the database file. Under Windows, (file normalize test.db) is expanded using UNIX type path separators which TCL recognizes interchangeably. However, this means that the path reported by sqlite3_shared_cache_report doesn't match which causes the test case to fail. Made minor change to test case to hopefully correct this on all platforms. (CVS 5143) FossilOrigin-Name: 5ef61701398ce75e32cfaea2eacf2c3e80832ca0 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/shared.test | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 4a1aac1411..db035d1e26 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\ssqlite3Atoi64\sto\sreturn\strue\sif\shanded\sa\snumber\sof\sall\szeros.\s\sThe\nfailure\sto\sdo\sthis\sis\sbenign\sas\ssqlite3Atoi64()\sis\scurrent\sused,\sbut\sthat\nmight\schange\sin\sthe\sfuture\sso\sit\sis\sgood\sto\sgo\sahead\sand\sfix\sthe\sfunction\nto\sreturn\sthe\scorrect\sresult.\s(CVS\s5142) -D 2008-05-19T15:54:59 +C SQLite\sstores\snative\sfile\snames\sand\spaths\sfor\sthe\sdatabase\sfile.\s\sUnder\sWindows,\s(file\snormalize\stest.db)\sis\sexpanded\susing\sUNIX\stype\spath\sseparators\swhich\sTCL\srecognizes\sinterchangeably.\s\s\sHowever,\sthis\smeans\sthat\sthe\spath\sreported\sby\ssqlite3_shared_cache_report\sdoesn't\smatch\swhich\scauses\sthe\stest\scase\sto\sfail.\s\sMade\sminor\schange\sto\stest\scase\sto\shopefully\scorrect\sthis\son\sall\splatforms.\s(CVS\s5143) +D 2008-05-19T20:11:40 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -432,7 +432,7 @@ F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8 F test/select7.test 7906735805cfbee4dddc0bed4c14e68d7f5f9c5f F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c -F test/shared.test bff836a2c32418f01561d268b4c1d026a454e59b +F test/shared.test c6769531e0cb751d46a9838c0532d3786606c0f6 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749 F test/shared_err.test 202ce115a4bfab2b41da5d4c9431f68a474134a6 @@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 70793be63c0c6dab42d48c096e0e051e37d7e788 -R 8b6a62c0e12ab6eb68cfbdd48cce346b -U drh -Z 91f6e64dddd67b37f9decbab5419e693 +P bc90787583dd2dadff72d516de9720d4a36e7fd2 +R 22f0e32263f04f1c10de732563542a44 +U shane +Z 0ed652a054220cb34754df08abc06527 diff --git a/manifest.uuid b/manifest.uuid index b2b5aa344c..a9036a6fb0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bc90787583dd2dadff72d516de9720d4a36e7fd2 \ No newline at end of file +5ef61701398ce75e32cfaea2eacf2c3e80832ca0 \ No newline at end of file diff --git a/test/shared.test b/test/shared.test index f05e9651a2..3ae5909344 100644 --- a/test/shared.test +++ b/test/shared.test @@ -9,7 +9,7 @@ # #*********************************************************************** # -# $Id: shared.test,v 1.31 2008/04/28 16:19:35 danielk1977 Exp $ +# $Id: shared.test,v 1.32 2008/05/19 20:11:40 shane Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -888,7 +888,7 @@ do_test shared-$av.11.8 { if {[llength [info command sqlite3_shared_cache_report]]==1} { do_test shared-$av.11.9 { string tolower [sqlite3_shared_cache_report] - } [string tolower [list [file normalize test.db] 2]] + } [string tolower [list [file nativename [file normalize test.db]] 2]] } do_test shared-$av.11.11 {