Add the --with-tcl=DIR option to the test/releasetest.tcl script.

FossilOrigin-Name: 4dda916a572bcb54c8cf3b81d965328632a722eb

diff --git a/manifest b/manifest
index 8bdf9339ebca6405ca9ea4e15c5f2c1c6222e3bb..57b60093216cb754dd031511c92d27c96fafa6a8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Run\sfuzzershell\sas\spart\sof\sthe\svalgrindtest\smakefile\starget.
-D 2015-04-24T16:53:03.100
+C Add\sthe\s--with-tcl=DIR\soption\sto\sthe\stest/releasetest.tcl\sscript.
+D 2015-04-24T17:50:37.253
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e25a3b8036f49bc0a08694b7a41ee0913d60f4e5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -814,7 +814,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl ca3390bad7c156c6d635e2b657332a5067f44acc
+F test/releasetest.tcl f649253610c8b0b0d63ad85b0d2961867d4f0ac0
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1253,7 +1253,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 98edc6152cdd935dc83c1330c088145e7adb9dd0
-R 57cb1c15bd3f01264a7d78a199355194
+P 0bb96a037bd7179cb3a6137bb29827fc7d72ec3f
+R 490f17d8f0cbe5def4bfbb0990513b33
 U drh
-Z 84cb54aeebcbf9196abb3e78dcce4413
+Z 0a587d9a322583805c3550241286812f

diff --git a/manifest.uuid b/manifest.uuid
index 64fbb318e4d986bde1def5ab2077a394efe7b320..8fbf34353fb35aafd678f21e07e22d75ec013387 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0bb96a037bd7179cb3a6137bb29827fc7d72ec3f
\ No newline at end of file
+4dda916a572bcb54c8cf3b81d965328632a722eb
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index f9eb96c2a65c879c7425f6a1fedb7d6f8dcf94d9..9cd30e195dd4d9f24e8ccde387a26dbed27986f1 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -18,6 +18,7 @@ optional) are:
     --buildonly                        (Just build testfixture - do not run)
     --dryrun                           (Print what would have happened)
     --info                             (Show diagnostic info)
+    --with-tcl=DIR                     (Use TCL build at DIR)
 
 The default value for --srcdir is the parent of the directory holding
 this script.
@@ -355,7 +356,7 @@ proc run_test_suite {name testtarget config} {
   set cflags [expr {$::MSVC ? "-Zi" : "-g"}]
   set opts ""
   set title ${name}($testtarget)
-  set configOpts ""
+  set configOpts $::WITHTCL
 
   regsub -all {#[^\n]*\n} $config \n config
   foreach arg $config {
@@ -486,6 +487,7 @@ proc process_options {argv} {
   set ::DRYRUN    0
   set ::EXEC      exec
   set ::TRACE     0
+  set ::WITHTCL   {}
   set config {}
   set platform $::tcl_platform(os)-$::tcl_platform(machine)
 
@@ -560,6 +562,10 @@ proc process_options {argv} {
         }
       }
 
+      -with-tcl=* {
+        set ::WITHTCL -$x
+      }
+
       -D* -
       -O* -
       -enable-* -