Disable failing tests which were absent in previous versions. Don't check FEATURES (bug #278870).

Package-Manager: portage-13851-svn/cvs/Linux x86_64

4 files changed, 44 insertions, 18 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 16599a7cc526..50400e32ac37 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.263 2009/07/27 17:02:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.264 2009/07/27 22:08:43 arfrever Exp $
+
+  27 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.6.16.ebuild, +files/sqlite-3.6.16-tkt3922.test.patch:
+  Disable failing tests which were absent in previous versions. Don't check
+  FEATURES (bug #278870).
 
   27 Jul 2009; nixnut <nixnut@gentoo.org> sqlite-3.6.14.2.ebuild:
   ppc stable #275592
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index f4e795f3309c..d7044c1d8d01 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -3,6 +3,7 @@ AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3.6.14.2-fix_alignment.patch 870 RMD160 754a1c9b00ff204e99e11acbdddcfc49af0a4af6 SHA1 8b4c715831b32d739c05f89fe3069f27ffc3e0e0 SHA256 bc42e667c692a436ba06dbb1c724c757f75cae1272d817fcb8517453c633cf38
+AUX sqlite-3.6.16-tkt3922.test.patch 502 RMD160 d9f7075d71046dbbed8c3d053df36a636a4d8ae5 SHA1 36fabdf4fe2b2046e810694d89e914949bef0f62 SHA256 c9f246e62c930b8cdefe541f13ed2aabe729bbf2ed96fded021c2fe7940f16c4
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.6.13.tar.gz 2780584 RMD160 2a9b3be1f087f63560ba63784b090b4fcf847d57 SHA1 632b5661ba7f59e92ce805ebcdf2cc3e9b28a051 SHA256 2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
 DIST sqlite-3.6.14.2.tar.gz 2896850 RMD160 219833d61a2e0bf5fde136528b9725c0589d2491 SHA1 19206a419e39bb2de01ed12c2d95c928e97e7252 SHA256 94a5b9dcc841baeb000971b15c6b66f50add7bc160030de5aea8622db3e7060e
@@ -15,6 +16,6 @@ EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601
 EBUILD sqlite-3.6.13.ebuild 2402 RMD160 05a42171c46908601690ca27539faf4a686c8f1a SHA1 7a87bcb01ac267e936b2d5ac9c8fec36e28a28d2 SHA256 399324b1c79316a87a8cf3aa61e50e4fc736ba630cc2ede61a40012d0362b034
 EBUILD sqlite-3.6.14.2.ebuild 2299 RMD160 29d0105f277cfbe7e88b5185eb94b4f8947a40cd SHA1 646c18ad222ac6ce33cf5c4ab84cf7a37e87f295 SHA256 988be9e9ff102866685bb1f00ff67a3243a08445f6744fa55132728dcec39383
 EBUILD sqlite-3.6.15.ebuild 1902 RMD160 e3f820799deb351877cc76b75fa05269655cb4ba SHA1 0f8e760be93340f6c15fffe219bb809105c7baaf SHA256 cdf0e8403255291f63f4963aeb0464aa5f244a98626de0aff1c38b58d3146161
-EBUILD sqlite-3.6.16.ebuild 2294 RMD160 388f0fae51e7753ec15db3357ddd086a5b38be01 SHA1 20a0b7f4f581f15ee52a7923bb20f7309373e094 SHA256 f7a48ba81a1ef2ae31157ebf9f0d21ce3a031db1350519766758a734f94e2043
-MISC ChangeLog 35981 RMD160 d24e289217c0a66cd8e2e1d33a3e2c40f74669a7 SHA1 fc89a1140f4e9c963bef3718b13abe9e7f6183d7 SHA256 8276fe4c7a388ce02f03ef2d87455cfa81e5a25969dac070200f1356c03ef492
+EBUILD sqlite-3.6.16.ebuild 2246 RMD160 c529fc882cd21ab7eb8f58aa612bfcec14115aa4 SHA1 9b5ed1404086cc47d672729235a566bc3072feb8 SHA256 d9b0308bcdc42217a4f6401a36d9ca7b4ef02d3a5338c8eb5408f90ad9484d2d
+MISC ChangeLog 36224 RMD160 0449b15576e727f464975d7598ef9ddb5e9b3958 SHA1 7569753e1e66d8a8660dbd376d27ad42be6c147b SHA256 e8961b86535cc32b6605c6f40cac8aa33ac361bb2891ca4e3a23c5426c16d576
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
diff --git a/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch b/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch
new file mode 100644
index 000000000000..d092bc17e3d4
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.16-tkt3922.test.patch
@@ -0,0 +1,23 @@
+--- test/tkt3922.test
++++ test/tkt3922.test
+@@ -36,20 +36,6 @@
+     }
+   } {-1 integer}
+ }
+-do_test tkt3922.2 {
+-  execsql {
+-    DELETE FROM t1;
+-    INSERT INTO t1 VALUES('-9223372036854775809');
+-    SELECT a, typeof(a) FROM t1;
+-  }
+-} {-9.22337203685478e+18 real}
+-do_test tkt3922.3 {
+-  execsql {
+-    DELETE FROM t1;
+-    INSERT INTO t1 VALUES('-9223372036854776832');
+-    SELECT a, typeof(a) FROM t1;
+-  }
+-} {-9.22337203685478e+18 real}
+ do_test tkt3922.4 {
+   execsql {
+     DELETE FROM t1;
diff --git a/dev-db/sqlite/sqlite-3.6.16.ebuild b/dev-db/sqlite/sqlite-3.6.16.ebuild
index 32b336f55899..c7064d3d196b 100644
--- a/dev-db/sqlite/sqlite-3.6.16.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.16.ebuild,v 1.1 2009/06/27 21:31:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.16.ebuild,v 1.2 2009/07/27 22:08:43 arfrever Exp $
 
 EAPI="2"
 
@@ -23,23 +23,12 @@ RDEPEND="tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
-pkg_setup() {
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl; then
-			ewarn "You must enable the tcl use flag if you want to run the testsuite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-}
-
 src_prepare() {
 	# note: this sandbox fix is no longer needed with sandbox-1.3+
 	epatch "${FILESDIR}"/sandbox-fix2.patch
 
+	epatch "${FILESDIR}"/${P}-tkt3922.test.patch
+
 	epunt_cxx
 }
 
@@ -62,10 +51,18 @@ src_compile() {
 }
 
 src_test() {
-	if has userpriv ${FEATURES}; then
+	if [[ "${EUID}" -ne "0" ]]; then
 		local test=test
 		use debug && test=fulltest
 		emake ${test} || die "some test(s) failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+
+	if ! use tcl; then
+		ewarn "You must enable the tcl USE flag if you want to run the testsuite."
+		eerror "Testsuite will not be run."
 	fi
 }