Addressed problem in src_test() (reverted to bash mysql-test program)

Package-Manager: portage-2.0.53_rc5

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index fa054811935c28946a6fef0ffb3194151e2d1f72..470ed502b3126fd1a77301b423f0afedd9846656 100644 (file)
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.245 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.246 2005/10/18 16:14:01 vivo Exp $
+
+  18 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild:
+  Addressed problem in src_test() (reverted to bash mysql-test program)
 
   17 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58-r1.ebuild,
   mysql-4.0.22.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.24.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 43b42d217f29b9fe4dba0c0f4d21e641f233e208..b8182c8b3ca6238914e365b7a8acdacd9cb352d5 100644 (file)
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,4 +1,4 @@
-MD5 0912bc2b5a29bb6250ba6cc77030f740 ChangeLog 44404
+MD5 094e064dc8676f2a7567f6756605cb53 ChangeLog 44547
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22 139
 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139
@@ -26,6 +26,6 @@ MD5 ac74397784bc6979c6cee6319f5be131 mysql-4.0.24.ebuild 9833
 MD5 6ddc57a27bb81cc6417c0ff0f65ccebe mysql-4.0.25-r2.ebuild 13782
 MD5 fb51170ee4c074186668c3cdc838e4d4 mysql-4.0.26.ebuild 14840
 MD5 87324d0d1763454c10561efa44ae1a7b mysql-4.1.13-r1.ebuild 17587
-MD5 775a99ce24b199a14819c372ebb63dc3 mysql-4.1.14.ebuild 17967
+MD5 16b3c5e3bf5b069ad45fa36bb588a498 mysql-4.1.14.ebuild 18251
 MD5 4be7d98b934e64a7d8daaf6382223377 mysql-5.0.12_beta.ebuild 18210
 MD5 a2fe03addadd10dc1584c0f7bea40122 mysql-5.0.13_rc.ebuild 18366

diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index d1aa2ef7ad8a7635a4af091d0c7d61cd1aa38573..4d958ff11e26db5b5e8d3a76ad767404c6d5c15a 100644 (file)
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.10 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.11 2005/10/18 16:14:01 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -352,10 +352,18 @@ src_test() {
                local retstatus
                addpredict /this-dir-does-not-exist/t9.MYI
 
-               version_is_at_least "5.0.6_beta" \
-               && make test-force \
-               || make test
+               # Temporary removed, 4.1.14 use mysql-test-run.pl instead 
+               # of mysql-test-run, thus failing on test that should be
+               # skipped.
+               #version_is_at_least "5.0.6_beta" \
+               #&& make test-force \
+               #|| make test
+
+               # <replace me whenever possible>
+               cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
                retstatus=$?
+               cd ..
+               # </replace me whenever possible>
 
                # to be sure ;)
                pkill -9 -f "${S}/ndb" 2>/dev/null