From f5d6f1e0c5da1f5a203487ab8dd059bfbe7d16f3 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 10 Sep 2010 00:59:28 +0000 Subject: [PATCH] replaced relative lock proxy paths with absolute FossilOrigin-Name: 6a88cd46aeef3c50c91d5aadc61dd0b0982f8a4f --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/lock6.test | 8 +++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 5e7fe544c4..ed9bc71607 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\sSQLite\sis\srunning\swith\sMEMSTATUS\senabled\sat\sthe\sbeginning\sof\severy\ntest\sscript. -D 2010-09-10T00:18:13 +C replaced\srelative\slock\sproxy\spaths\swith\sabsolute +D 2010-09-10T00:59:29 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c58f7d37ad0f9b28655ba4e28c6cb0f879569cd7 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -492,7 +492,7 @@ F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00 F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5 F test/lock5.test d0d313f059ae5661726d3f197ba6ed8f69257d8e -F test/lock6.test 8df56060f396151777390982422c800d026e1722 +F test/lock6.test b3cb49eec15cfcd6573b0a52b032046066f12114 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64 F test/lock_common.tcl 18c637fc89e12f1ac0d27d2186f12c3d3f789e3e F test/lock_proxy.test 9ea4307b186949fcfd012e4cd44149d2b6360da6 @@ -851,7 +851,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P cf23a354975f581c2cf2299e2b2a4e00819830ad -R 3c3ac2bdf6b980eb2b6650224c262a0a -U drh -Z 85f119d8bca7ec3dcce819a40a5ee998 +P b6e9a4d8f7d8b683b4098270e0be149df1ef295f +R b3a4bc0eed7f1409726f394aa90844d7 +U adam +Z 0aedbc146af318be7220b19097c0cae5 diff --git a/manifest.uuid b/manifest.uuid index 5200411ae3..2050174ff8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b6e9a4d8f7d8b683b4098270e0be149df1ef295f \ No newline at end of file +6a88cd46aeef3c50c91d5aadc61dd0b0982f8a4f \ No newline at end of file diff --git a/test/lock6.test b/test/lock6.test index 84f88881eb..5257670529 100644 --- a/test/lock6.test +++ b/test/lock6.test @@ -126,9 +126,10 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking { set lockpath } {{:auto: (not held)}} + set lpp [pwd]/notmine do_test lock6-1.4.1 { + execsql "PRAGMA lock_proxy_file='$lpp'" catchsql { - PRAGMA lock_proxy_file="notmine"; select * from sqlite_master; } db } {1 {database is locked}} @@ -137,7 +138,7 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking { execsql { PRAGMA lock_proxy_file; } db - } {notmine} + } $lpp do_test lock6-1.5 { testfixture $::tf1 { @@ -150,9 +151,10 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking { catch {testfixture $::tf1 {db close}} + set lpp [pwd]/mine do_test lock6-1.6 { + execsql "PRAGMA lock_proxy_file='$lpp'" execsql { - PRAGMA lock_proxy_file="mine"; select * from sqlite_master; } db } {} -- 2.47.2