Improvements to the omittest.tcl script.

FossilOrigin-Name: 0f05d7e93a73bbeac0a09bbd614287507355a7d75fc7b98729bcf7607fc8e125

diff --git a/manifest b/manifest
index 83ef433b5f469a41fe98cbe796ae05cb1d43b427..c6d7e1f95e5fb5cc0aa0b6921345cfa8c144fd9d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\s'sqlite3changegroup_*'\sfunctions\sare\sincluded\sin\sthe\sSQLITE_APICALL\shandling.
-D 2017-05-12T14:05:11.958
+C Improvements\sto\sthe\somittest.tcl\sscript.
+D 2017-05-15T15:05:48.869
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -1526,7 +1526,7 @@ F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
-F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
+F tool/omittest.tcl dfc8b18a23e9e5289104145b712cdb887c2d840c2d70dc09ce5dbeba8ed8d47c
 F tool/opcodesum.tcl 740ed206ba8c5040018988129abbf3089a0ccf4a
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/replace.tcl 60f91e8dd06ab81f74d213ecbd9c9945f32ac048
@@ -1580,7 +1580,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 339df63f4064f3b9c8d4e8b82e72d00b49d9406bc350b14809a4caf7ddc4b736
-R f32069ec3ca4ccef1057ce7127947f8c
-U mistachkin
-Z 1ae8fc54b0b13feeb3ff5e35a3c2108d
+P a123cb93307a6c48bd711d6af9828c87a1365e023f6fe4ca6eae264c8ec5e0c0
+R 72b16ccdef50cad498e60404ed6c0e91
+U drh
+Z 62d2ddcfe5df879e17f37c06a1755a54

diff --git a/manifest.uuid b/manifest.uuid
index 286d3ef96eda3fc8632f5dd0dc0a24e36976e40e..b1887b0e01b6bd4f374d10bc02ae1e054bc4d5fd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a123cb93307a6c48bd711d6af9828c87a1365e023f6fe4ca6eae264c8ec5e0c0
\ No newline at end of file
+0f05d7e93a73bbeac0a09bbd614287507355a7d75fc7b98729bcf7607fc8e125
\ No newline at end of file

diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index 5437f2eb01e5ad493fbb8b66d7b417337236fcc6..c42519dd8c19f83687355f754673bb9fb7deb78a 100644 (file)
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -1,6 +1,3 @@
-
-set rcsid {$Id: omittest.tcl,v 1.8 2008/10/13 15:35:09 drh Exp $}
-
 # Documentation for this script. This may be output to stderr
 # if the script is invoked incorrectly.
 set ::USAGE_MESSAGE {
@@ -134,26 +131,37 @@ proc process_options {argv} {
   set ::TARGET testfixture                  ;# Default thing to build
 
   for {set i 0} {$i < [llength $argv]} {incr i} {
-    switch -- [lindex $argv $i] {
-      -makefile {
+    switch -regexp -- [lindex $argv $i] {
+      -{1,2}makefile {
         incr i
         set ::MAKEFILE [lindex $argv $i]
       }
   
-      -nmake {
+      -{1,2}nmake {
         set ::MAKEBIN nmake
         set ::MAKEFILE ./Makefile.msc
       }
 
-      -target {
+      -{1,2}target {
         incr i
         set ::TARGET [lindex $argv $i]
       }
 
-      -skip_run {
+      -{1,2}skip_run {
         set ::SKIP_RUN 1
       }
 
+      -{1,2}help {
+        puts $::USAGE_MESSAGE
+        exit
+      }
+
+      -.* {
+        puts stderr "Unknown option: [lindex $argv i]"
+        puts stderr $::USAGE_MESSAGE
+        exit 1
+      }
+
       default {
         if {[info exists ::SYMBOL]} {
           puts stderr [string trim $::USAGE_MESSAGE]