diff options
| author | dan <dan@noemail.net> | 2010-08-20 12:31:30 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2010-08-20 12:31:30 +0000 |
| commit | 3d5790596e116f27b14df5b39b9e0b690e4ca5af (patch) | |
| tree | e667564b48392ac5ac0cfe164909fe81d35d9ac7 | |
| parent | 9ab7fe87e5e3a58e12c17bc42a3deb7bbb79c6f8 (diff) | |
| download | sqlite-3d5790596e116f27b14df5b39b9e0b690e4ca5af.tar.gz sqlite-3d5790596e116f27b14df5b39b9e0b690e4ca5af.zip | |
Avoid assuming that the user has "." in their path when running multi-process tests.
FossilOrigin-Name: daa5d461b98fc068cbba52d338ca8690edd27bc9
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | test/lock_common.tcl | 3 |
3 files changed, 9 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Fix\sbackcompat.test\sso\sthat\sit\sworks\swith\swindows\smandatory\slocking. -D 2010-08-19T17:16:11 +C Avoid\sassuming\sthat\sthe\suser\shas\s"."\sin\stheir\spath\swhen\srunning\smulti-process\stests. +D 2010-08-20T12:31:30 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -490,7 +490,7 @@ F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5 F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada F test/lock6.test 8df56060f396151777390982422c800d026e1722 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64 -F test/lock_common.tcl 751d4d6b1d97e1e1266b4126e0a123f1e8d7346b +F test/lock_common.tcl 6586fc80d8518aa3c7da08af033bbd283ed6fca8 F test/lookaside.test 382e7bc2fab23d902c8eafb1b9ed7ababfff75a6 F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9 @@ -845,7 +845,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 7999910e85b1f24c5860425ba47e7ab10c22e887 -R 2312b59b9cab0b977ed7b7f3e201421e +P 8d05f66db7d6e8b8916fcf22fa92159d863d2610 +R 3cb626532d96dbbd2c42f67aa60740fe U dan -Z e72bc2907346bae2124df9a31e8a0e8b +Z 1b26b23e6878cdb3ce0d4315c76a4f13 diff --git a/manifest.uuid b/manifest.uuid index c1a130221..a10a2b989 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8d05f66db7d6e8b8916fcf22fa92159d863d2610
\ No newline at end of file +daa5d461b98fc068cbba52d338ca8690edd27bc9
\ No newline at end of file diff --git a/test/lock_common.tcl b/test/lock_common.tcl index 34d6eb0ff..acb517447 100644 --- a/test/lock_common.tcl +++ b/test/lock_common.tcl @@ -67,8 +67,9 @@ proc do_multiclient_test {varname script} { # down by closing the channel. proc launch_testfixture {{prg ""}} { write_main_loop - if {$prg eq ""} { set prg [info nameofexec] } + if {$prg eq ""} { set prg [file join . [info nameofexec]] } if {$prg eq ""} { set prg [file join . testfixture] } + if {[file tail $prg]==$prg} { set prg [file join . $prg] } set chan [open "|$prg tf_main.tcl" r+] fconfigure $chan -buffering line set rc [catch { |