Fix a test script problem causing crash8.test to fail when run with leak-sanitizer.

FossilOrigin-Name: 2c437f7a2c87129d00c71fa569315b68e0ba9514041d93503350c9ae9f080f17

diff --git a/manifest b/manifest
index 2803befcbf25ee7227ec7acd66419ba54de31a5f..a3ce931da49c680ee741086bd9f68a561ad7e34c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\s"substring()"\sas\san\salias\sfor\s"substr()"\sfor\scompatibility\swith\sother\nSQL\sengines.
-D 2020-11-23T14:50:43.871
+C Fix\sa\stest\sscript\sproblem\scausing\scrash8.test\sto\sfail\swhen\srun\swith\sleak-sanitizer.
+D 2020-11-23T15:30:16.535
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1431,7 +1431,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 6417cbb60c4169804e2e1b36ce1a840c9f33d0b0d97956e058f3cc49ed3904f0
+F test/tester.tcl 754521f0db534d51ab504b2d14fe0bdca1f1c15de731ceb8ee5bfd78372a2a5f
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1886,7 +1886,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 07f53899a929cce93f17c0332819610c9517c7e54e00092af20efd746cf84438
-R dcfe5e7a17a169b4d1aa539b16823865
-U drh
-Z 29d71f92fc7453cb272a15e096e896f3
+P aa2ee5754c9f8378c4d490ca756a6415042904477727f0d86e9c0190b5e8b275
+R 8b09c129b5616689dddf768a62867ed7
+U dan
+Z 7a4f3964eb07b9a4c17563a7fe83c3f9

diff --git a/manifest.uuid b/manifest.uuid
index 7fa2ed78bfd9cc5ec47a8825fab15119130fe587..7134337870fb809fa5b3acf7e0119b8f28b1ade2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa2ee5754c9f8378c4d490ca756a6415042904477727f0d86e9c0190b5e8b275
\ No newline at end of file
+2c437f7a2c87129d00c71fa569315b68e0ba9514041d93503350c9ae9f080f17
\ No newline at end of file

diff --git a/test/tester.tcl b/test/tester.tcl
index b1acb0686ab2ecdd64d48e7820118f9ce2cd9974..3b91ff46cb404a02b0bbd7d3eb74c60023cc5fec 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1731,6 +1731,9 @@ proc crashsql {args} {
       set msg "child process exited abnormally"
     }
   }
+  if {$r && [string match {*ERROR: LeakSanitizer*} $msg]} {
+    set msg "child process exited abnormally"
+  }
 
   lappend r $msg
 }