From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94E4E1396D2 for ; Thu, 28 Sep 2017 17:18:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D076E0CA7; Thu, 28 Sep 2017 17:18:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AEAEE0CAE for ; Thu, 28 Sep 2017 17:18:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9610341706 for ; Thu, 28 Sep 2017 17:18:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D8819086 for ; Thu, 28 Sep 2017 17:18:50 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1506618659.339ebb6495f1bd6f9baf0293f7a6e2ae938eea47.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/, dev-db/sqlite/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch dev-db/sqlite/sqlite-3.20.1-r1.ebuild X-VCS-Directories: dev-db/sqlite/ dev-db/sqlite/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 339ebb6495f1bd6f9baf0293f7a6e2ae938eea47 X-VCS-Branch: master Date: Thu, 28 Sep 2017 17:18:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e6c94cd-c551-4540-a189-c4348ee93b59 X-Archives-Hash: 4e3aa5268430f0e3b4cd26f2c3c5f0ae commit: 339ebb6495f1bd6f9baf0293f7a6e2ae938eea47 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Sep 28 15:34:57 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Sep 28 17:10:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339ebb64 dev-db/sqlite: Fix tests on big-endian architectures (bug #630818). ...lite-3.20.1-full_tarball-tests-big-endian.patch | 95 ++++++++++++++++++++++ dev-db/sqlite/sqlite-3.20.1-r1.ebuild | 1 + 2 files changed, 96 insertions(+) diff --git a/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch new file mode 100644 index 00000000000..427021d2f7b --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch @@ -0,0 +1,95 @@ +https://www.sqlite.org/src/info/87ccdf9cbb928455 + +--- test/fts3conf.test ++++ test/fts3conf.test +@@ -136,47 +136,49 @@ + do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}} + fts3_integrity 2.2.4 db t1 + +-do_execsql_test 3.1 { +- CREATE VIRTUAL TABLE t3 USING fts4; +- REPLACE INTO t3(docid, content) VALUES (1, 'one two'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0100000002000000'} +- +-do_execsql_test 3.2 { +- REPLACE INTO t3(docid, content) VALUES (2, 'one two three four'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four' +-} {X'0200000003000000'} +- +-do_execsql_test 3.3 { +- REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0200000005000000'} +- +-do_execsql_test 3.4 { +- UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0100000006000000'} +- +-do_execsql_test 3.5 { +- UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0100000006000000'} +- +-do_execsql_test 3.6 { +- REPLACE INTO t3(docid, content) VALUES (3, 'one two'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0100000002000000'} +- +-do_execsql_test 3.7 { +- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four'); +- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six'); +- SELECT docid FROM t3; +-} {3 4 5} +- +-do_execsql_test 3.8 { +- UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0200000002000000'} ++if {$tcl_platform(byteOrder)=="littleEndian"} { ++ do_execsql_test 3.1 { ++ CREATE VIRTUAL TABLE t3 USING fts4; ++ REPLACE INTO t3(docid, content) VALUES (1, 'one two'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0100000002000000'} ++ ++ do_execsql_test 3.2 { ++ REPLACE INTO t3(docid, content) VALUES (2, 'one two three four'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four' ++ } {X'0200000003000000'} ++ ++ do_execsql_test 3.3 { ++ REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0200000005000000'} ++ ++ do_execsql_test 3.4 { ++ UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0100000006000000'} ++ ++ do_execsql_test 3.5 { ++ UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0100000006000000'} ++ ++ do_execsql_test 3.6 { ++ REPLACE INTO t3(docid, content) VALUES (3, 'one two'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0100000002000000'} ++ ++ do_execsql_test 3.7 { ++ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four'); ++ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six'); ++ SELECT docid FROM t3; ++ } {3 4 5} ++ ++ do_execsql_test 3.8 { ++ UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0200000002000000'} ++} + + #------------------------------------------------------------------------- + # Test that the xSavepoint is invoked correctly if the first write diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild index 7b6ce7814c0..137b7b0eeb2 100644 --- a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild +++ b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild @@ -51,6 +51,7 @@ src_prepare() { if full_tarball; then eapply -p0 "${FILESDIR}/${PN}-3.20.0-full_tarball-build.patch" eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-csv-unsigned_char.patch" + eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-tests-big-endian.patch" eapply_user