public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/sqlite] rawhide: Patch fts3corrupt4.test failure and re-enable csv01.test
@ 2026-07-13 14:57 Petr Khartskhaev
  0 siblings, 0 replies; only message in thread
From: Petr Khartskhaev @ 2026-07-13 14:57 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/sqlite
            Branch : rawhide
            Commit : faea37529752d0134154f3678443e2822a105834
            Author : Petr Khartskhaev <pkhartsk@redhat.com>
            Date   : 2026-07-13T11:34:33+02:00
            Stats  : +50/-7 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/sqlite/c/faea37529752d0134154f3678443e2822a105834?branch=rawhide

            Log:
            Patch fts3corrupt4.test failure and re-enable csv01.test

Work around failing test that was (probably) fixed upstream
See https://sqlite.org/forum/forumpost/316effd37e4d1f07

csv01.test no longer seems to hang on non-intel architectures,
so I re-enabled it

---
diff --git a/sqlite-3.53.3-fix-fts3corrupt4-test.patch b/sqlite-3.53.3-fix-fts3corrupt4-test.patch
new file mode 100644
index 0000000..7108d66
--- /dev/null
+++ b/sqlite-3.53.3-fix-fts3corrupt4-test.patch
@@ -0,0 +1,46 @@
+Revert the test to not have a little endian condition
+as the corruption is now detected (probably) correctly:
+https://sqlite.org/forum/forumpost/316effd37e4d1f07
+
+diff --git a/test/fts3corrupt4.test b/test/fts3corrupt4.test
+index a23a24b..e0e4c99 100644
+--- a/test/fts3corrupt4.test
++++ b/test/fts3corrupt4.test
+@@ -4403,31 +4403,12 @@ do_catchsql_test 25.5 {
+     INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ;
+ } {0 {}}
+ 
+-if {$tcl_platform(byteOrder)=="littleEndian"} {
+-  # The SQLITE_CORRUPT error depends on the specific random byte
+-  # sequence generated by SQLite's PRNG.  But the SQLite PRNG
+-  # uses ChaCha20, which generates a different byte sequence on
+-  # big-endian and little-endian platforms.  The SQLITE_CORRUPT
+-  # error only comes up when the pseudo-random byte sequence is
+-  # the one generated on little-endian platforms.
+-  #
+-  # See Forum thread:
+-  # https://sqlite.org/forum/forumpost/b5f89d813babfd88
+-  #
+-  do_catchsql_test 25.6a {
+-    INSERT INTO t1(t1) SELECT x FROM t2;
+-  } {1 {database disk image is malformed}}
+-  do_catchsql_test 25.6b {
+-    INSERT INTO t1(t1) SELECT x FROM t2;
+-  } {1 {database disk image is malformed}}
+-} else {
+-  do_catchsql_test 25.6a {
+-    INSERT INTO t1(t1) SELECT x FROM t2;
+-  } {0 {}}
+-  do_catchsql_test 25.6b {
+-    INSERT INTO t1(t1) SELECT x FROM t2;
+-  } {0 {}}
+-}
++do_catchsql_test 25.6a {
++  INSERT INTO t1(t1) SELECT x FROM t2;
++} {1 {database disk image is malformed}}
++do_catchsql_test 25.6b {
++  INSERT INTO t1(t1) SELECT x FROM t2;
++} {1 {database disk image is malformed}}
+ 
+ 
+ #-------------------------------------------------------------------------

diff --git a/sqlite.spec b/sqlite.spec
index 9b458fa..f77be28 100644
--- a/sqlite.spec
+++ b/sqlite.spec
@@ -23,6 +23,7 @@ Source1: http://www.sqlite.org/%{year}/sqlite-doc-%{docver}.zip
 Patch1: sqlite-3.6.23-lemon-system-template.patch
 Patch2: sqlite-3.49.0-fix-lemon-missing-cflags.patch
 Patch3: sqlite-3.53.0-fix-testrunner-exiting-0.patch
+Patch4: sqlite-3.53.3-fix-fts3corrupt4-test.patch
 
 BuildRequires: make
 BuildRequires: gcc gcc-c++
@@ -174,6 +175,7 @@ This package contains the analysis program for %{name}.
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
+%patch -P 4 -p1
 
 # The atof test is failing on the i686 architecture, when binary configured with
 # --enable-rtree option. Failing part is text->real conversion and
@@ -302,12 +304,7 @@ chrpath --delete $RPM_BUILD_ROOT/%{_bindir}/sqlite3_analyzer
 export LD_LIBRARY_PATH=`pwd`/.libs
 export MALLOC_CHECK_=3
 
-# csv01 hangs on all non-intel archs i've tried
-%ifnarch x86_64 %{ix86}
-rm test/csv01.test
-%endif
-
-make test
+make test || (echo "Tests failed, printing full log..." && cat testrunner.log && exit 1)
 %endif
 # ends %%{with check} if
 
@@ -357,7 +354,7 @@ make test
 %endif
 
 %changelog
-* Fri Jun 26 2026 Packit <hello@packit.dev> - 3.53.3-1
+* Mon Jul 13 2026 Petr Khartskhaev <pkhartsk@redhat.com> - 3.53.3-1
 - Update to version 3.53.3
 - Resolves: rhbz#2493788
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-13 14:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13 14:57 [rpms/sqlite] rawhide: Patch fts3corrupt4.test failure and re-enable csv01.test Petr Khartskhaev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox