Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/
Date: Wed, 27 Feb 2019 22:35:38
Message-Id: 1551306919.0ac6b43b9f88dcc321ae16fac9a3c967fceffa29.floppym@gentoo
1 commit: 0ac6b43b9f88dcc321ae16fac9a3c967fceffa29
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Wed Feb 27 21:49:16 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 27 22:35:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac6b43b
7
8 dev-db/sqlite: Fix tests with dev-lang/tcl-8.6.9.
9
10 Fixes: https://bugs.gentoo.org/675862
11 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 .../files/sqlite-3.27.2-full_archive-tests.patch | 36 ++++++++++++++++++++++
15 dev-db/sqlite/sqlite-3.27.2.ebuild | 1 +
16 2 files changed, 37 insertions(+)
17
18 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
19 new file mode 100644
20 index 00000000000..92959579b54
21 --- /dev/null
22 +++ b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch
23 @@ -0,0 +1,36 @@
24 +https://sqlite.org/src/info/29d02bf2fa9ecacb
25 +
26 +--- /ext/session/sessionB.test
27 ++++ /ext/session/sessionB.test
28 +@@ -258,8 +258,7 @@
29 + INSERT INTO t2 VALUES('a', 'a', 'a', 'a');
30 + } {
31 + DELETE FROM t2 WHERE c = 'a';
32 +-} {
33 +-}
34 ++} {}
35 +
36 + # INSERT + UPDATE
37 + do_patchconcat_test 4.3.4 {
38 +--- /test/fts3expr4.test
39 ++++ /test/fts3expr4.test
40 +@@ -68,7 +68,7 @@
41 + AND {AND {AND {PHRASE 3 0 *} {PHRASE 3 0 lol+}} {PHRASE 3 0 *}} {PHRASE 3 0 h4h+}
42 + }
43 +
44 +-do_simple_expr_test 3.3 { * } { }
45 ++do_simple_expr_test 3.3 { * } {}
46 + do_simple_expr_test 3.4 { *a } { PHRASE 3 0 a }
47 + do_simple_expr_test 3.5 { a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
48 + do_simple_expr_test 3.6 { *a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
49 +--- /test/scanstatus.test
50 ++++ /test/scanstatus.test
51 +@@ -254,7 +254,7 @@
52 + }
53 +
54 + do_execsql_test 4.1.1 { INSERT INTO t1 VALUES(1, 2, 3); }
55 +-do_scanstatus_test 4.1.2 { }
56 ++do_scanstatus_test 4.1.2 {}
57 +
58 + do_execsql_test 4.2 {
59 + CREATE TABLE p1(x PRIMARY KEY);
60
61 diff --git a/dev-db/sqlite/sqlite-3.27.2.ebuild b/dev-db/sqlite/sqlite-3.27.2.ebuild
62 index 570c5a4f74e..d008a6a8e1b 100644
63 --- a/dev-db/sqlite/sqlite-3.27.2.ebuild
64 +++ b/dev-db/sqlite/sqlite-3.27.2.ebuild
65 @@ -59,6 +59,7 @@ pkg_setup() {
66 src_prepare() {
67 if full_archive; then
68 eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch"
69 + eapply "${FILESDIR}/${PN}-3.27.2-full_archive-tests.patch"
70
71 eapply_user