Add the ability to put comments in the Config and Platform setup sections of

the releasetest.tcl script.

FossilOrigin-Name: d6f8c899d8f1bf66a2234e0eb91b259dd64eed31

diff --git a/manifest b/manifest
index a0918609eb5584ce888e7a46f62db5eb690bc475..08193af1d2b7f98dddadec324b428713b1ac205a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Autoconf\sconfigure\sscript\supdates:\s\s(1)\sremove\sthe\slong-obsolete\n--enable-cross-thread-connections\soption.\s\s(2)\sremove\sthe\s--with-hints=\soptions.\n(3)\sExtension\sloading\sis\senabled\sby\sdefault.\s\s(4)\sCheck\sfor\sstrchrnull()\n(5)\sUpdate\sthe\s--help\stext.
-D 2015-01-10T14:27:17.510
+C Add\sthe\sability\sto\sput\scomments\sin\sthe\sConfig\sand\sPlatform\ssetup\ssections\sof\nthe\sreleasetest.tcl\sscript.
+D 2015-01-10T15:21:26.432
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 876093578650b28af50a20c819993ee779885adb
 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 c7a6647a96745dff41c08a80064e16da48177c43
+F test/releasetest.tcl 70cf548d0d3dd57c6bd689ba4d68a75ac651ccde
 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 90f422ed81311d7ab2a90a381d36cba9c20227fc
-R c5a4ce14614667baa6ac385b32cb8bb4
+P 5004063ce4c8816125372ecc5fd52140489306dd
+R 0032fe6b65d76fb914bf757ab4a44e02
 U drh
-Z 991825883a98cc750918a7830191009b
+Z a5cee4a786b96df9f5af795aa5d3dc7a

diff --git a/manifest.uuid b/manifest.uuid
index 24e0fa7fca8055ad9f32c0eb593b03dbf35a0fdc..6cb3dd802a737129da0e8466f056c7cb84a6efd2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5004063ce4c8816125372ecc5fd52140489306dd
\ No newline at end of file
+d6f8c899d8f1bf66a2234e0eb91b259dd64eed31
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 7d843bb32420074a2cc083d0969fd464aa55cb70..1d6ca184ad4d3816cd5ef1d952e94a8a7e4ba22b 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -29,7 +29,14 @@ Every test begins with a fresh run of the configure script at the top
 of the SQLite source tree.
 }
 
-array set ::Configs {
+# Omit comments (text between # and \n) in a long multi-line string.
+#
+proc strip_comments {in} {
+  regsub -all {#[^\n]*\n} $in {} out
+  return $out
+}
+
+array set ::Configs [strip_comments {
   "Default" {
     -O2
     --disable-amalgamation --disable-shared
@@ -166,13 +173,19 @@ array set ::Configs {
     -DSQLITE_ENABLE_FTS4
     -DSQLITE_ENABLE_RTREE
   }
+
+  # The next group of configurations are used only by the
+  # Failure-Detection platform.  They are all the same, but we need
+  # different names for them all so that they results appear in separate
+  # subdirectories.
+  #
   Fail0 {-O0}
   Fail2 {-O0}
   Fail3 {-O0}
   Fail4 {-O0}
-}
+}]
 
-array set ::Platforms {
+array set ::Platforms [strip_comments {
   Linux-x86_64 {
     "Check-Symbols"           checksymbols
     "Debug-One"               "mptest test"
@@ -206,6 +219,11 @@ array set ::Platforms {
   "Windows NT-intel" {
     "Default"                 "mptest fulltestonly"
   }
+
+  # The Failure-Detection platform runs various tests that deliberately
+  # fail.  This is used as a test of this script to verify that this script
+  # correctly identifies failures.
+  #
   Failure-Detection {
     Fail0     "TEST_FAILURE=0 test"
     Sanitize  "TEST_FAILURE=1 test"
@@ -213,7 +231,7 @@ array set ::Platforms {
     Fail3     "TEST_FAILURE=3 valgrindtest"
     Fail4     "TEST_FAILURE=4 test"
   }
-}
+}]
 
 
 # End of configuration section.