Fix issues with command line invocation of wapptest.tcl.

FossilOrigin-Name: 9e0d5d2640a92070967bc9fdf5c5b1653e41b9c04e04dcb70f18ead10f053aef

diff --git a/manifest b/manifest
index 7f287734ed8ca6d08fe03524ff70109c64b08f70..9c3fb30b7ea27c0088e0e0f0d28ce91fbeb44205 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\serror\sdetection\slogic\sin\sreleasetest.tcl\sto\saccount\sfor\snew\noutput\sformats\sin\sUSAN.
-D 2019-10-02T19:44:42.821
+C Fix\sissues\swith\scommand\sline\sinvocation\sof\swapptest.tcl.
+D 2019-10-03T13:44:08.247
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1677,7 +1677,7 @@ F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 F test/walvfs.test f1accd66c876e3a0f6b4bef5b18d13411062d0ff0a0016e32bb41570474e99fc
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
-F test/wapptest.tcl 3090239c59379d41e1a0644feb6683082fdb86edfab0c668973f8003f22c0e5d x
+F test/wapptest.tcl 3cca775aede0591756a1fc0da55bbb3715d8c363873fd2cfdd4d555b0a4af57d x
 F test/where.test 19c709c9f0f6ed12c23f909f6592aa55fba34269d5a2898537aa27a22b9ce650
 F test/where2.test 478d2170637b9211f593120648858593bf2445a1
 F test/where3.test 2341a294e17193a6b1699ea7f192124a5286ca6acfcc3f4b06d16c931fbcda2c
@@ -1846,7 +1846,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 cb9470fc064aad72a4e42c6a021410401b3b1a32446ae8b9cd9c759f0a2a01ef
-R 42217a92c28b2e1a6ff9feadd8dca169
-U drh
-Z da6ec24cc1528148e0d2ff88b8e73751
+P 3f36b988360204628d5ad1df2db34818b9a2d6ba989018d4c17757229f4b0f65
+R 1ccda743d3e9d70fa02a48a9934b7b56
+U dan
+Z 91e4861321d88dff250a48c5b1521faf

diff --git a/manifest.uuid b/manifest.uuid
index e33e0ab270d09706a5c34803baac618228b5858a..83246f21441b9734b5bf02d64590ca658374f2e3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f36b988360204628d5ad1df2db34818b9a2d6ba989018d4c17757229f4b0f65
\ No newline at end of file
+9e0d5d2640a92070967bc9fdf5c5b1653e41b9c04e04dcb70f18ead10f053aef
\ No newline at end of file

diff --git a/test/wapptest.tcl b/test/wapptest.tcl
index 5753455e2bebe8af93ad1ac31bc6a25a052033ad..201078e78dedd18345f18b7d56a7fc5ddb795aca 100755 (executable)
--- a/test/wapptest.tcl
+++ b/test/wapptest.tcl
@@ -825,8 +825,13 @@ for {set i 0} {$i < [llength $argv]} {incr i} {
   }
 }
 
+wapptest_init
 for {set i 0} {$i < [llength $lTestArg]} {incr i} {
-  switch -- [lindex $lTestArg $i] {
+  set opt [lindex $lTestArg $i]
+  if {[string range $opt 0 1]=="--"} {
+    set opt [string range $opt 1 end]
+  }
+  switch -- $opt {
     -platform {
       if {$i==[llength $lTestArg]-1} { wapptest_usage }
       incr i
@@ -882,7 +887,6 @@ for {set i 0} {$i < [llength $lTestArg]} {incr i} {
   }
 }
 
-wapptest_init
 if {$G(noui)==0} {
   wapp-start $lWappArg
 } else {