In releasetest.tcl, copy certain command-line arguments (-g, -D..., etc)

down into each test run.

FossilOrigin-Name: 889864b58af1e51fb148af2d6a5cef4950f373f4

diff --git a/manifest b/manifest
index ca91d79350e21384aad8636253ec46d60a3c3e00..5b1acd49e67229bb46171644016542e327079dce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\svalgrind\starget\sto\sbe\sconsistent\swith\sregard\sto\starget\ssuffixes.
-D 2015-01-07T18:19:09.561
+C In\sreleasetest.tcl,\scopy\scertain\scommand-line\sarguments\s(-g,\s-D...,\setc)\ndown\sinto\seach\stest\srun.
+D 2015-01-07T18:44:59.340
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3a2b5f8356e11591b2a7b23ce444654424591d06
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -801,7 +801,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test dd30a4858d8e0fbad2304c2bd74a33d4df36412a
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 64eaa07598cac0967311d5cacecba576ef4bc804
+F test/releasetest.tcl 8c0d89629ba78ebaf5a9f8323d7bfbe931e7bf08
 F test/resolver01.test 33abf37ff8335e6bf98f2b45a0af3e06996ccd9a
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1235,7 +1235,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 9b92a4d2b6585d5fdf20330e4138081df58960e9
-R 57542d62cffe2d566b148ef68993a058
-U mistachkin
-Z 0f5a5e7af0d0c3b98a248d1911e08a19
+P dc4aa7321262ace43d985a227ad052dfca7db6c7
+R 29f0edba48a2f5a2bdf9b5bce9d63229
+U drh
+Z 2d1cb7c03d7ff18e565521b6e31d33d6

diff --git a/manifest.uuid b/manifest.uuid
index 958d9156d6f84eeadb86863bd83a6f167b652f33..626643329bf11972d4f5c77b210f059db1955899 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc4aa7321262ace43d985a227ad052dfca7db6c7
\ No newline at end of file
+889864b58af1e51fb148af2d6a5cef4950f373f4
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 22c37c1721a05b5df2034f2c5341e39dbd5b5598..f2f49e61d7613079a3a50e2fd949a95d6594f165 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -394,7 +394,7 @@ proc process_options {argv} {
   for {set i 0} {$i < [llength $argv]} {incr i} {
     set x [lindex $argv $i]
     if {[regexp {^--[a-z]} $x]} {set x [string range $x 1 end]}
-    switch -- $x {
+    switch -glob -- $x {
       -srcdir {
         incr i
         set ::SRCDIR [file normalize [lindex $argv $i]]
@@ -445,6 +445,13 @@ proc process_options {argv} {
         }
         exit
       }
+      -g -
+      -D* -
+      -enable-* -
+      -disable-* -
+      *=* {
+        lappend ::EXTRACONFIG [lindex $argv $i]
+      }
 
       default {
         puts stderr ""
@@ -486,6 +493,7 @@ proc process_options {argv} {
 proc main {argv} {
 
   # Process any command line options.
+  set ::EXTRACONFIG {}
   process_options $argv
   puts [string repeat * 79]
 
@@ -497,7 +505,7 @@ proc main {argv} {
   foreach {zConfig target} $::CONFIGLIST {
     if {$::QUICK} {set target test}
     if {$::BUILDONLY} {set target testfixture}
-    set config_options $::Configs($zConfig)
+    set config_options [concat $::Configs($zConfig) $::EXTRACONFIG]
 
     incr NTEST
     run_test_suite $zConfig $target $config_options