Add the --config option to wapptest.tcl. The argument is a glob pattern. All

configurations must match the glob pattern in order to run.  The default value
is "*".

FossilOrigin-Name: 51255bad4c1fb6074f602586fabad675ae310b9c37f4b80ecf60e2959fb0db12

diff --git a/manifest b/manifest
index 3bb5c732d0f7584837475af61cdc3ca9f814eb56..d5a469c1f34489f182ac014d6ad87e74d283d664 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sexpected\serror\smessages\sin\ssome\sOOM\stest\scases\sto\saccount\sfor\s[44d77a7f807].
-D 2022-07-11T21:40:34.209
+C Add\sthe\s--config\soption\sto\swapptest.tcl.\s\sThe\sargument\sis\sa\sglob\spattern.\s\sAll\nconfigurations\smust\smatch\sthe\sglob\spattern\sin\sorder\sto\srun.\s\sThe\sdefault\svalue\nis\s"*".
+D 2022-07-11T22:20:39.584
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1801,7 +1801,7 @@ F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 F test/walvfs.test bccb3e0d235ef85e276f491d34db32c9ada1ea67be8d9f10aabe7b30319ec656
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
-F test/wapptest.tcl 899594e25684861d5b0c0880fb012364def50ef8097041b8ddf74be5ba7fa270 x
+F test/wapptest.tcl 8d69504451f613141fc0107a60c4fdcf59745cb3d421cdcd051deb6cdf36b288 x
 F test/where.test d13cd7c24e80009d2b54e2f7a8893c457afa49c64f99359c9eb3fe668ba1d9d4
 F test/where2.test 03c21a11e7b90e2845fc3c8b4002fc44cc2797fa74c86ee47d70bd7ea4f29ed6
 F test/where3.test 5b4ffc0ac2ea0fe92f02b1244b7531522fe4d7bccf6fa8741d54e82c10e67753
@@ -1979,8 +1979,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P afb9e60ee3b194f33664a6722356e5d3c69ce1d4da1a0affd92b8e6aaf4dd2da
-R 8ea09e929549a140c3e6dd1310564461
-U dan
-Z f4f04c769fa4ae18f60bb76e1371a738
+P b3d6b3c3fc68dca7e20418eefa35ce3b583322b884b88a11c6773419f027a7a4
+R fba8b20c9fe2d30ccb99ea466f2ceaef
+U drh
+Z 2c62dc1d407b4391742c0258c96664b6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 548db96f5db2774f555c84425f98d2143c416181..7b69f77625c3aa2ddce7864a4fd02de12dc3ea41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3d6b3c3fc68dca7e20418eefa35ce3b583322b884b88a11c6773419f027a7a4
\ No newline at end of file
+51255bad4c1fb6074f602586fabad675ae310b9c37f4b80ecf60e2959fb0db12
\ No newline at end of file

diff --git a/test/wapptest.tcl b/test/wapptest.tcl
index b7e16e72276b175d8725f0aacbeccb900ac75206..47eeee5f1ddbffe8f996e8184477fe0446413e8e 100755 (executable)
--- a/test/wapptest.tcl
+++ b/test/wapptest.tcl
@@ -8,6 +8,7 @@ source [file join [file dirname [info script]] wapp.tcl]
 # Variables set by the "control" form:
 #
 #   G(platform) - User selected platform.
+#   G(cfgglob)  - Glob pattern that all configurations must match
 #   G(test)     - Set to "Normal", "Veryquick", "Smoketest" or "Build-Only".
 #   G(keep)     - Boolean. True to delete no files after each test.
 #   G(msvc)     - Boolean. True to use MSVC as the compiler.
@@ -15,6 +16,7 @@ source [file join [file dirname [info script]] wapp.tcl]
 #   G(jobs)     - How many sub-processes to run simultaneously.
 #
 set G(platform) $::tcl_platform(os)-$::tcl_platform(machine)
+set G(cfgglob   *
 set G(test)     Normal
 set G(keep)     1
 set G(msvc)     0
@@ -117,6 +119,10 @@ proc set_test_array {} {
     if {$G(debug)==0} { set debug "-nodebug"}
     foreach {config target} [releasetest_data tests $debug $G(platform)] {
 
+      # All configuration names must match $g(cfgglob), which defaults to *
+      #
+      if {![string match -nocase $G(cfgglob) $config]} continue
+
       # If using MSVC, do not run sanitize or valgrind tests. Or the
       # checksymbols test.
       if {$G(msvc) && (
@@ -785,6 +791,7 @@ default it uses "wapp" to provide an interactive interface. Supported
 command line options (all optional) are:
 
     --platform    PLATFORM         (which tests to run)
+    --config      GLOB             (only run configurations matching GLOB)
     --smoketest                    (run "make smoketest" only)
     --veryquick                    (run veryquick.test only)
     --buildonly                    (build executables, do not run tests)
@@ -876,6 +883,12 @@ for {set i 0} {$i < [llength $lTestArg]} {incr i} {
       set G(stdout) 1
     }
 
+    -config {
+      if {$i==[llength $lTestArg]-1} { wapptest_usage }
+      incr i
+      set G(cfgglob) [lindex $lTestArg $i]
+    }
+
     -stdout {
       set G(stdout) 1
     }