From 0ac6b43b9f88dcc321ae16fac9a3c967fceffa29 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Wed, 27 Feb 2019 22:49:16 +0100 Subject: [PATCH] dev-db/sqlite: Fix tests with dev-lang/tcl-8.6.9. Fixes: https://bugs.gentoo.org/675862 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Signed-off-by: Mike Gilbert --- .../sqlite-3.27.2-full_archive-tests.patch | 36 +++++++++++++++++++ dev-db/sqlite/sqlite-3.27.2.ebuild | 1 + 2 files changed, 37 insertions(+) create mode 100644 dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch diff --git a/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch new file mode 100644 index 000000000000..92959579b542 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch @@ -0,0 +1,36 @@ +https://sqlite.org/src/info/29d02bf2fa9ecacb + +--- /ext/session/sessionB.test ++++ /ext/session/sessionB.test +@@ -258,8 +258,7 @@ + INSERT INTO t2 VALUES('a', 'a', 'a', 'a'); + } { + DELETE FROM t2 WHERE c = 'a'; +-} { +-} ++} {} + + # INSERT + UPDATE + do_patchconcat_test 4.3.4 { +--- /test/fts3expr4.test ++++ /test/fts3expr4.test +@@ -68,7 +68,7 @@ + AND {AND {AND {PHRASE 3 0 *} {PHRASE 3 0 lol+}} {PHRASE 3 0 *}} {PHRASE 3 0 h4h+} + } + +-do_simple_expr_test 3.3 { * } { } ++do_simple_expr_test 3.3 { * } {} + do_simple_expr_test 3.4 { *a } { PHRASE 3 0 a } + do_simple_expr_test 3.5 { a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} } + do_simple_expr_test 3.6 { *a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} } +--- /test/scanstatus.test ++++ /test/scanstatus.test +@@ -254,7 +254,7 @@ + } + + do_execsql_test 4.1.1 { INSERT INTO t1 VALUES(1, 2, 3); } +-do_scanstatus_test 4.1.2 { } ++do_scanstatus_test 4.1.2 {} + + do_execsql_test 4.2 { + CREATE TABLE p1(x PRIMARY KEY); diff --git a/dev-db/sqlite/sqlite-3.27.2.ebuild b/dev-db/sqlite/sqlite-3.27.2.ebuild index 570c5a4f74e5..d008a6a8e1b1 100644 --- a/dev-db/sqlite/sqlite-3.27.2.ebuild +++ b/dev-db/sqlite/sqlite-3.27.2.ebuild @@ -59,6 +59,7 @@ pkg_setup() { src_prepare() { if full_archive; then eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch" + eapply "${FILESDIR}/${PN}-3.27.2-full_archive-tests.patch" eapply_user -- 2.26.2