From 1db7db1f03303b798ac572dbc2de8a2d7beea745 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 12 Feb 2018 15:27:32 +0000
Subject: [PATCH] Update test file func6.test so that it works with
 SQLITE_ENABLE_NULL_TRIM builds.

FossilOrigin-Name: e128d72f1a565551d3b6fdb3807fcb1c2a2bf355f0c09d04562b62f49d01fdbc
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/test_config.c |  6 ++++++
 test/func6.test   | 21 +++++++++++++++++++--
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 6364a68c58..8f42c5f8a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spossible\sinfinite\sloop\sin\sVACUUM\sthat\scan\scome\sup\swhen\sthe\sschema\nhas\sbeen\scarefully\scorrupted.\s\sProblem\sdiscovered\sby\sOSSFuzz.\sTest\scases\nin\sTH3.
-D 2018-02-12T13:30:34.512
+C Update\stest\sfile\sfunc6.test\sso\sthat\sit\sworks\swith\sSQLITE_ENABLE_NULL_TRIM\nbuilds.
+D 2018-02-12T15:27:32.327
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -513,7 +513,7 @@ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
 F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
 F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
-F src/test_config.c cc8a1d44648d9392a14f4ecfc841d027daaf61f952b9f70792edf11373aaa3dd
+F src/test_config.c 03df8eb9dc8d5ee96588dfa34fd989c75625d5a0daf59491e32b966da4010870
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
 F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
@@ -927,7 +927,7 @@ F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test d202a7606d23f90988a664e88e268aed1087c11c
 F test/func4.test 6beacdfcb0e18c358e6c2dcacf1b65d1fa80955f
 F test/func5.test cdd224400bc3e48d891827cc913a57051a426fa4
-F test/func6.test 612311a51adad23326d15353eea8d90394798acb26dd1f7c7cad59bd8ac982d2
+F test/func6.test 90e42b64c4f9fb6f04f44cb8a1da586c8542502e926b19c76504fe74ff2a9b7c
 F test/fuzz-oss1.test e58330d01cbbd8215ee636b17a03fe220b37dbfa
 F test/fuzz.test 96083052bf5765e4518c1ba686ce2bab785670d1
 F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
@@ -1705,7 +1705,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 3aed949a18a251c5795f21f0385c205a127502b7e9cf06bc7f4c763951cd7984
-R fd19a34320fb110422297cf4ffe4adf5
-U drh
-Z e49790afb4374ff1f3bcb3262a0392c1
+P 27754b74ddf6463c6f9c48ea0df3637945b5ea086b92a41ddeb55b9aaefea4c2
+R 6efccf0da31b2c149ed049f6fe56fc5d
+U dan
+Z 5bfb70e60829ab8825e3358e0b864cd4
diff --git a/manifest.uuid b/manifest.uuid
index 01c0f92c3d..029b7dbbe1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-27754b74ddf6463c6f9c48ea0df3637945b5ea086b92a41ddeb55b9aaefea4c2
\ No newline at end of file
+e128d72f1a565551d3b6fdb3807fcb1c2a2bf355f0c09d04562b62f49d01fdbc
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index ad63016baf..c3961ad928 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -501,6 +501,12 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
 
 Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
 
+#ifdef SQLITE_ENABLE_NULL_TRIM
+  Tcl_SetVar2(interp, "sqlite_options", "null_trim", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "null_trim", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_OR_OPTIMIZATION
   Tcl_SetVar2(interp, "sqlite_options", "or_opt", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/func6.test b/test/func6.test
index 50415e7963..1e16a7ca38 100644
--- a/test/func6.test
+++ b/test/func6.test
@@ -22,6 +22,11 @@ ifcapable !offset_sql_func {
   return
 }
 
+set bNullTrim 0
+ifcapable null_trim {
+  set bNullTrim 1
+}
+
 do_execsql_test func6-100 {
   PRAGMA page_size=4096;
   PRAGMA auto_vacuum=NONE;
@@ -51,6 +56,13 @@ proc loadhex {file} {
 proc hexrecord {args} {
   set hdr ""
   set body ""
+
+  if {$::bNullTrim} {
+    while {[llength $args] && [lindex $args end]=={}} {
+      set args [lrange $args 0 end-1]
+    }
+  }
+
   foreach x $args {
     if {$x==""} {
       append hdr 00
@@ -103,12 +115,17 @@ set F [loadhex test.db]
 db func offrec offrec
 
 # Test the sanity of the tests.
+if {$bNullTrim} {
+  set offset 8180
+} else {
+  set offset 8179
+}
 do_execsql_test func6-105 {
   SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1;
-} {8179}
+} $offset
 do_test func6-106 {
   set r [hexrecord abc001 1 999 {}]
-  offset_contains_record 8179 $F $r
+  offset_contains_record $offset $F $r
 } 0
 
 set z100 [string trim [string repeat "0 " 100]]