Update error detection logic in releasetest.tcl to account for new

output formats in USAN.

FossilOrigin-Name: 3f36b988360204628d5ad1df2db34818b9a2d6ba989018d4c17757229f4b0f65

diff --git a/manifest b/manifest
index b514708d03969e13f3b35e67ea544fa0c7e06f14..7f287734ed8ca6d08fe03524ff70109c64b08f70 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scorruptM.test\sto\saccount\sfor\sthe\sfact\sthat\sthe\sdatabase\sschema\smay\sbe\sloaded\sfrom\swithin\sthe\s"sqlite3"\scommand\sfor\ssome\stest\spermutations.
-D 2019-10-02T19:43:38.593
+C Update\serror\sdetection\slogic\sin\sreleasetest.tcl\sto\saccount\sfor\snew\noutput\sformats\sin\sUSAN.
+D 2019-10-02T19:44:42.821
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1249,7 +1249,7 @@ F test/recover.test ccb8c2623902a92ebb76770edd075cb4f75a4760bb7afde38026572c6e79
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
-F test/releasetest.tcl 968fc1e8fd23e113fb8a04379747f3a9f2c12d207b2de85aeff5a825962e1cd7 x
+F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b0049153 x
 F test/releasetest_data.tcl 9919fc6ac5bc92f8878fecfd1840db15999f660a6c9f609240b41aa62b885c88
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
@@ -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 67da31e24ebb49c4cac81c9e7cfca37ca422555fd0fdb01d8f180890783c84ff
-R af61f483cecb17e85d55b46e8f6dcdd9
-U dan
-Z 55a2533bc51db158e8dea3afe120e7b9
+P cb9470fc064aad72a4e42c6a021410401b3b1a32446ae8b9cd9c759f0a2a01ef
+R 42217a92c28b2e1a6ff9feadd8dca169
+U drh
+Z da6ec24cc1528148e0d2ff88b8e73751

diff --git a/manifest.uuid b/manifest.uuid
index 16a75fe4743b9a4d36061d2fb8d17f0729d60b11..e33e0ab270d09706a5c34803baac618228b5858a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb9470fc064aad72a4e42c6a021410401b3b1a32446ae8b9cd9c759f0a2a01ef
\ No newline at end of file
+3f36b988360204628d5ad1df2db34818b9a2d6ba989018d4c17757229f4b0f65
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 997e5eab9f672d2a0ce7d65f5afc23075524d8a2..37f00eb4c005fd9460f8ff99ca8c2047fad66012 100755 (executable)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -412,6 +412,8 @@ proc count_tests_and_errors {logfile rcVar errmsgVar} {
       # skip over "value is outside range" errors
       if {[regexp {value .* is outside the range of representable} $line]} {
          # noop
+      } elseif {[regexp {overflow: .* cannot be represented} $line]} {
+         # noop
       } else {
         incr ::NERRCASE
         if {$rc==0} {