From: mistachkin <mistachkin@noemail.net>
Date: Mon, 2 Nov 2015 21:05:56 +0000 (+0000)
Subject: Get things working better on Windows with MSVC.
X-Git-Tag: version-3.10.0~178^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59189433ba8a2c4bc2fbf579ea0f67edb454578d;p=thirdparty%2Fsqlite.git

Get things working better on Windows with MSVC.

FossilOrigin-Name: 22cc3e6c8e7f7eed854f8a50138ccb9c79bb7a23
---

diff --git a/manifest b/manifest
index 3f100a7b32..cb6c413e21 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\s--dryrun\soption\son\sthe\sreleasetest.tcl\sscript.
-D 2015-11-02T20:52:20.250
+C Get\sthings\sworking\sbetter\son\sWindows\swith\sMSVC.
+D 2015-11-02T21:05:56.617
 F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -948,7 +948,7 @@ F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 1012f41f1a5fefd6a62331332b97a9938e1c64cc
+F test/releasetest.tcl 39d6de145cc95e81a6a48cead3fa7825a01040d3
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1397,7 +1397,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 20e96f521fce12ffeb6be788e57bce88f287cff5
-R f117a4a5b3ef13cab54d6f985044aa83
-U dan
-Z a5ae3477937f7e46f7556e9e0025f641
+P e565e0261501e4c21e4ad3d12f9f5b24c761bf96
+R 1187737c11e82a8337e5d517b5bc7406
+U mistachkin
+Z 7eb3b356bb9807dcced0017ec4636c5d
diff --git a/manifest.uuid b/manifest.uuid
index f6c11f5fa7..aa6b9eb88c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e565e0261501e4c21e4ad3d12f9f5b24c761bf96
\ No newline at end of file
+22cc3e6c8e7f7eed854f8a50138ccb9c79bb7a23
\ No newline at end of file
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index c6d98a0116..19867f8ff6 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -424,7 +424,18 @@ proc run_slave_test {} {
   set rc 0
   set rc [catch [configureCommand $configOpts]]
   if {!$rc} {
+    if {[info exists ::env(TCLSH_CMD)]} {
+      set savedEnv(TCLSH_CMD) $::env(TCLSH_CMD)
+    } else {
+      unset -nocomplain savedEnv(TCLSH_CMD)
+    }
+    set ::env(TCLSH_CMD) [file nativename [info nameofexecutable]]
     set rc [catch [makeCommand $testtarget $cflags $opts]]
+    if {[info exists savedEnv(TCLSH_CMD)]} {
+      set ::env(TCLSH_CMD) $savedEnv(TCLSH_CMD)
+    } else {
+      unset -nocomplain ::env(TCLSH_CMD)
+    }
   }
 
   # Exis successfully if the test passed, or with a non-zero error code
@@ -518,7 +529,8 @@ proc run_all_test_suites {alltests} {
       #
       set tm1 [clock seconds]
       incr G(nJob)
-      set fd [open "|[info nameofexecutable] [info script] --slave" r+]
+      set script [file normalize [info script]]
+      set fd [open "|[info nameofexecutable] $script --slave" r+]
       fconfigure $fd -blocking 0
       fileevent $fd readable [list slave_fileevent $fd $T $tm1]
       puts $fd [list $::TRACE $::MSVC $::DRYRUN]