| 1 |
commit: f229e8879c64888b6c5559cb5815c538b3fda681 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 13 03:12:50 2011 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 13 03:12:50 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f229e887 |
| 7 |
|
| 8 |
Replace mysql_disable_test calls with mysql-v2_disable_test. |
| 9 |
Should finally disable the remaining failing tests. |
| 10 |
|
| 11 |
(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98) |
| 12 |
|
| 13 |
--- |
| 14 |
dev-db/mysql/ChangeLog | 6 ++++++ |
| 15 |
dev-db/mysql/Manifest | 36 ++++++++++++++++++------------------ |
| 16 |
dev-db/mysql/mysql-5.1.57.ebuild | 28 ++++++++++++++-------------- |
| 17 |
dev-db/mysql/mysql-5.1.58.ebuild | 28 ++++++++++++++-------------- |
| 18 |
dev-db/mysql/mysql-5.5.13.ebuild | 2 +- |
| 19 |
dev-db/mysql/mysql-5.5.14.ebuild | 2 +- |
| 20 |
6 files changed, 54 insertions(+), 48 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog |
| 23 |
index 5ef15e1..7618886 100644 |
| 24 |
--- a/dev-db/mysql/ChangeLog |
| 25 |
+++ b/dev-db/mysql/ChangeLog |
| 26 |
@@ -2,6 +2,12 @@ |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
# $Header: $ |
| 29 |
|
| 30 |
+ 13 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 31 |
+ mysql-5.1.57.ebuild, mysql-5.1.58.ebuild, mysql-5.5.13.ebuild, |
| 32 |
+ mysql-5.5.14.ebuild: |
| 33 |
+ Replace mysql_disable_test calls with mysql-v2_disable_test. |
| 34 |
+ Should finally disable the remaining failing tests. |
| 35 |
+ |
| 36 |
18 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 37 |
mysql-5.1.57.ebuild: |
| 38 |
Update mysql-v2 eclass to use the git-2 eclass. |
| 39 |
|
| 40 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
| 41 |
index c083699..3d9fa3f 100644 |
| 42 |
--- a/dev-db/mysql/Manifest |
| 43 |
+++ b/dev-db/mysql/Manifest |
| 44 |
@@ -20,29 +20,29 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711 |
| 45 |
EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947 |
| 46 |
EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892 |
| 47 |
EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16 |
| 48 |
-EBUILD mysql-5.1.57.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219 |
| 49 |
-EBUILD mysql-5.1.58.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219 |
| 50 |
+EBUILD mysql-5.1.57.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c |
| 51 |
+EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c |
| 52 |
EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b |
| 53 |
EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b |
| 54 |
-EBUILD mysql-5.5.13.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602 |
| 55 |
-EBUILD mysql-5.5.14.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602 |
| 56 |
+EBUILD mysql-5.5.13.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a |
| 57 |
+EBUILD mysql-5.5.14.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a |
| 58 |
EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b |
| 59 |
-MISC ChangeLog 6065 RMD160 95779b300845c38a2573e8fa17f7322f19732630 SHA1 ec4ab909266a4b8fdfd8d1506b601ede4c8267e3 SHA256 c8dedfca95d419ccd6221da8baf7745ee28f09f1d05505854f78f6a7f5283a68 |
| 60 |
+MISC ChangeLog 6338 RMD160 1262023ae8d67749555b81053a39d4eaf1d48951 SHA1 03497a58196205a086237847771b8d00afa905b2 SHA256 7966bf217b328b7a45c3e4a4a2218bf4031e94d23822e3119db6b7022a148b75 |
| 61 |
MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2 |
| 62 |
-----BEGIN PGP SIGNATURE----- |
| 63 |
Version: GnuPG v2.0.17 (GNU/Linux) |
| 64 |
|
| 65 |
-iQIcBAEBCgAGBQJOHP76AAoJEC8ZTXQF1qEP0a0P/2+Db0ViAl8wu17jOVnOpDxn |
| 66 |
-Ys4YdzbUT/qW89SYkmsN960gRBxmTA4PSepYsIZeZ7Z2dp4xQm/muZ+ROKDXEbV/ |
| 67 |
-zhbKxwgZEOksS2XZVSPSpVybXeyERQqQsmTtbcGkjnr5Ht92Um6v3k8UcjJP2NP/ |
| 68 |
-viO0brB1EG09znQ7BrUZqxItTYTEngewowEny6XAeCMMCWzXpGNgFL770EyfWv5t |
| 69 |
-JBmflu2XyzSnsAm1bTq56hVpWfbQBrXPaKvgZ/zFCO0DAoXNgBH8/6npfv6pfEZ7 |
| 70 |
-AWNK+DoHf/rcagiU0LtFlr5JjVeTBjOsgHolbpOGOr+JCW2MoQQ0H7wvKJXQX5m+ |
| 71 |
-VNA/HTOfYLGEjfeWsqkeb0fHstwK8D8+/mwflvBt6SWnuWccTYpcP0WMPXWi7NNg |
| 72 |
-3vaHmB7Bi+/kFinHIi0BthVwjC4iPBmlAxxVxSmCgEe7marzKuE+0mXnNyh2giA3 |
| 73 |
-F2A0fka44yT5cii+N1hyMNjmRLRVgY8pZd6hwy35K5Ob6CFS9d7VY2T1SJXJl8y/ |
| 74 |
-dyDbJBIPObUAx9q6Tu4nUxjUn0+VC3cHfYnG4/+AEb++nlB2qvRucTMirXrYEJrB |
| 75 |
-kghT50WYVNy0tjI6aXU2D15XVGbG9D6CJoG/WdSnW0W8AUZmwvzARlmUQ3afjbgF |
| 76 |
-dYq5NsanDYv38h3bmxVe |
| 77 |
-=3neh |
| 78 |
+iQIcBAEBCgAGBQJOHQ0yAAoJEC8ZTXQF1qEP7tcQALMgDlluA45Kbutp92rnRbZ/ |
| 79 |
+k7OiRmjzyjiLDrV2F6Fr6y3CzGrzwb7GKj9Rjdgf30/X72Tqw4m91Vja2pXVicxD |
| 80 |
+YGHMp24lkExa41VX9CSAeF2TvZLu6wsjmNi1Jxyxr9hAefOASMCOT4cC3RSKrVGy |
| 81 |
+KQAdv3XS20b+AzVr5Bi0pYzHzi03zs50PEqd15sv/d0bTlrk5CnUsAEXmU+CDYU6 |
| 82 |
+6rQ08Vvsuz5bo4KIv0hbDzjBHIWzjFCb0vcCQrKX70+vT1EIh45GVd1M1q4AJhkE |
| 83 |
+AVb6mkhqlwyguIHZBzwm+4OZgs5bMYB3H7tuy2BfwDVjg0QsQ/MziHi5bIVzfCB0 |
| 84 |
+/+lBJ2vQlAESRENWeqwNHVzopIsSKxEhmD9SVOc9V2r/TrJsMw7xnyuIUyhhw0kw |
| 85 |
+n7xmVDeV9tMG5q2ccXuV7QMGIVf2aMw9MTYarWwmj6+jH92k/2Byv14mG6cNwh9C |
| 86 |
+vhie2Lis3AU72HNTOmGSGJQOP12QW5tFdBnaE9qiQQC+2UP08olX50CA4fN7Fg/i |
| 87 |
+xBfjCnuFyKDpRRE5El1DnyqUQs5QyT/5GxscwypdvlZ0ZBOV0TfQ77AeZ8o1D10u |
| 88 |
+qqJyPUqp8IweOORopSKpUyoB6GS2YvMCt72jzV1xNF948wreUFvzEtgWDnfHz1KU |
| 89 |
+gNLNcIlCklqFZGlUg0y6 |
| 90 |
+=LGFL |
| 91 |
-----END PGP SIGNATURE----- |
| 92 |
|
| 93 |
diff --git a/dev-db/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild |
| 94 |
index 1f72a5b..96da70b 100644 |
| 95 |
--- a/dev-db/mysql/mysql-5.1.57.ebuild |
| 96 |
+++ b/dev-db/mysql/mysql-5.1.57.ebuild |
| 97 |
@@ -71,12 +71,12 @@ src_test() { |
| 98 |
# USE=extraengines case |
| 99 |
case ${PV} in |
| 100 |
5.0.42) |
| 101 |
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42" |
| 102 |
+ mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" |
| 103 |
;; |
| 104 |
|
| 105 |
5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) |
| 106 |
[ "$(tc-endian)" == "big" ] && \ |
| 107 |
- mysql_disable_test \ |
| 108 |
+ mysql-v2_disable_test \ |
| 109 |
"archive_gis" \ |
| 110 |
"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" |
| 111 |
;; |
| 112 |
@@ -86,7 +86,7 @@ src_test() { |
| 113 |
# was fixed. |
| 114 |
case ${PV} in |
| 115 |
5.0.54|5.0.51*) |
| 116 |
- mysql_disable_test \ |
| 117 |
+ mysql-v2_disable_test \ |
| 118 |
"read_only" \ |
| 119 |
"Broken in 5.0.51-54, output in wrong order" |
| 120 |
;; |
| 121 |
@@ -94,14 +94,14 @@ src_test() { |
| 122 |
|
| 123 |
# Ditto to read_only |
| 124 |
[ "${PV}" == "5.0.51a" ] && \ |
| 125 |
- mysql_disable_test \ |
| 126 |
+ mysql-v2_disable_test \ |
| 127 |
"view" \ |
| 128 |
"Broken in 5.0.51, output in wrong order" |
| 129 |
|
| 130 |
# x86-specific, OOM issue with some subselects on low memory servers |
| 131 |
[ "${PV}" == "5.0.54" ] && \ |
| 132 |
[ "${ARCH/x86}" != "${ARCH}" ] && \ |
| 133 |
- mysql_disable_test \ |
| 134 |
+ mysql-v2_disable_test \ |
| 135 |
"subselect" \ |
| 136 |
"Testcase needs tuning on x86 for oom condition" |
| 137 |
|
| 138 |
@@ -109,7 +109,7 @@ src_test() { |
| 139 |
[ "${PV}" == "5.0.56" ] && \ |
| 140 |
for t in openssl_1 rpl_openssl rpl_ssl ssl \ |
| 141 |
ssl_8k_key ssl_compress ssl_connect ; do \ |
| 142 |
- mysql_disable_test \ |
| 143 |
+ mysql-v2_disable_test \ |
| 144 |
"$t" \ |
| 145 |
"OpenSSL tests broken on 5.0.56" |
| 146 |
done |
| 147 |
@@ -118,7 +118,7 @@ src_test() { |
| 148 |
# Upstream bug 41066 |
| 149 |
# http://bugs.mysql.com/bug.php?id=41066 |
| 150 |
[ "${PV}" == "5.0.72" ] && \ |
| 151 |
- mysql_disable_test \ |
| 152 |
+ mysql-v2_disable_test \ |
| 153 |
"status2" \ |
| 154 |
"Broken in 5.0.72, new test is broken, upstream bug #41066" |
| 155 |
|
| 156 |
@@ -141,7 +141,7 @@ src_test() { |
| 157 |
5.0.*|5.1.*|5.4.*|5.5.*) |
| 158 |
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
| 159 |
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
| 160 |
- mysql_disable_test \ |
| 161 |
+ mysql-v2_disable_test \ |
| 162 |
"$t" \ |
| 163 |
"These OpenSSL tests break due to expired certificates" |
| 164 |
done |
| 165 |
@@ -168,7 +168,7 @@ src_test() { |
| 166 |
main.information_schema \ |
| 167 |
main.not_partition funcs_1.is_columns_mysql \ |
| 168 |
funcs_1.is_tables_mysql funcs_1.is_triggers; do |
| 169 |
- mysql_disable_test "$t" "False positives in Gentoo" |
| 170 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 171 |
done |
| 172 |
;; |
| 173 |
esac |
| 174 |
@@ -180,21 +180,21 @@ src_test() { |
| 175 |
case ${PV} in |
| 176 |
5.1.5*|5.4.*|5.5.*|6*) |
| 177 |
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
| 178 |
- mysql_disable_test "$t" \ |
| 179 |
+ mysql-v2_disable_test "$t" \ |
| 180 |
"False positives in Gentoo: connect-timeout" |
| 181 |
done |
| 182 |
;; |
| 183 |
esac |
| 184 |
|
| 185 |
use profiling && use community \ |
| 186 |
- || mysql_disable_test main.profiling \ |
| 187 |
+ || mysql-v2_disable_test main.profiling \ |
| 188 |
"Profiling test needs profiling support" |
| 189 |
|
| 190 |
if [ "${PN}" == "mariadb" ]; then |
| 191 |
for t in \ |
| 192 |
parts.part_supported_sql_func_ndb \ |
| 193 |
parts.partition_auto_increment_ndb ; do |
| 194 |
- mysql_disable_test $t "ndb not supported in mariadb" |
| 195 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
| 196 |
done |
| 197 |
fi |
| 198 |
|
| 199 |
@@ -213,14 +213,14 @@ src_test() { |
| 200 |
innodb.innodb_bug49164 innodb.innodb_bug51920 \ |
| 201 |
innodb.innodb_bug54044 \ |
| 202 |
; do |
| 203 |
- mysql_disable_test $t "tests broken in xtradb" |
| 204 |
+ mysql-v2_disable_test $t "tests broken in xtradb" |
| 205 |
done |
| 206 |
fi |
| 207 |
|
| 208 |
# bug 332565 |
| 209 |
if ! use extraengine ; then |
| 210 |
for t in main.range ; do |
| 211 |
- mysql_disable_test $t "Test $t requires USE=extraengine" |
| 212 |
+ mysql-v2_disable_test $t "Test $t requires USE=extraengine" |
| 213 |
done |
| 214 |
fi |
| 215 |
|
| 216 |
|
| 217 |
diff --git a/dev-db/mysql/mysql-5.1.58.ebuild b/dev-db/mysql/mysql-5.1.58.ebuild |
| 218 |
index 1f72a5b..96da70b 100644 |
| 219 |
--- a/dev-db/mysql/mysql-5.1.58.ebuild |
| 220 |
+++ b/dev-db/mysql/mysql-5.1.58.ebuild |
| 221 |
@@ -71,12 +71,12 @@ src_test() { |
| 222 |
# USE=extraengines case |
| 223 |
case ${PV} in |
| 224 |
5.0.42) |
| 225 |
- mysql_disable_test "archive_gis" "Totally broken in 5.0.42" |
| 226 |
+ mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" |
| 227 |
;; |
| 228 |
|
| 229 |
5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) |
| 230 |
[ "$(tc-endian)" == "big" ] && \ |
| 231 |
- mysql_disable_test \ |
| 232 |
+ mysql-v2_disable_test \ |
| 233 |
"archive_gis" \ |
| 234 |
"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" |
| 235 |
;; |
| 236 |
@@ -86,7 +86,7 @@ src_test() { |
| 237 |
# was fixed. |
| 238 |
case ${PV} in |
| 239 |
5.0.54|5.0.51*) |
| 240 |
- mysql_disable_test \ |
| 241 |
+ mysql-v2_disable_test \ |
| 242 |
"read_only" \ |
| 243 |
"Broken in 5.0.51-54, output in wrong order" |
| 244 |
;; |
| 245 |
@@ -94,14 +94,14 @@ src_test() { |
| 246 |
|
| 247 |
# Ditto to read_only |
| 248 |
[ "${PV}" == "5.0.51a" ] && \ |
| 249 |
- mysql_disable_test \ |
| 250 |
+ mysql-v2_disable_test \ |
| 251 |
"view" \ |
| 252 |
"Broken in 5.0.51, output in wrong order" |
| 253 |
|
| 254 |
# x86-specific, OOM issue with some subselects on low memory servers |
| 255 |
[ "${PV}" == "5.0.54" ] && \ |
| 256 |
[ "${ARCH/x86}" != "${ARCH}" ] && \ |
| 257 |
- mysql_disable_test \ |
| 258 |
+ mysql-v2_disable_test \ |
| 259 |
"subselect" \ |
| 260 |
"Testcase needs tuning on x86 for oom condition" |
| 261 |
|
| 262 |
@@ -109,7 +109,7 @@ src_test() { |
| 263 |
[ "${PV}" == "5.0.56" ] && \ |
| 264 |
for t in openssl_1 rpl_openssl rpl_ssl ssl \ |
| 265 |
ssl_8k_key ssl_compress ssl_connect ; do \ |
| 266 |
- mysql_disable_test \ |
| 267 |
+ mysql-v2_disable_test \ |
| 268 |
"$t" \ |
| 269 |
"OpenSSL tests broken on 5.0.56" |
| 270 |
done |
| 271 |
@@ -118,7 +118,7 @@ src_test() { |
| 272 |
# Upstream bug 41066 |
| 273 |
# http://bugs.mysql.com/bug.php?id=41066 |
| 274 |
[ "${PV}" == "5.0.72" ] && \ |
| 275 |
- mysql_disable_test \ |
| 276 |
+ mysql-v2_disable_test \ |
| 277 |
"status2" \ |
| 278 |
"Broken in 5.0.72, new test is broken, upstream bug #41066" |
| 279 |
|
| 280 |
@@ -141,7 +141,7 @@ src_test() { |
| 281 |
5.0.*|5.1.*|5.4.*|5.5.*) |
| 282 |
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
| 283 |
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
| 284 |
- mysql_disable_test \ |
| 285 |
+ mysql-v2_disable_test \ |
| 286 |
"$t" \ |
| 287 |
"These OpenSSL tests break due to expired certificates" |
| 288 |
done |
| 289 |
@@ -168,7 +168,7 @@ src_test() { |
| 290 |
main.information_schema \ |
| 291 |
main.not_partition funcs_1.is_columns_mysql \ |
| 292 |
funcs_1.is_tables_mysql funcs_1.is_triggers; do |
| 293 |
- mysql_disable_test "$t" "False positives in Gentoo" |
| 294 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 295 |
done |
| 296 |
;; |
| 297 |
esac |
| 298 |
@@ -180,21 +180,21 @@ src_test() { |
| 299 |
case ${PV} in |
| 300 |
5.1.5*|5.4.*|5.5.*|6*) |
| 301 |
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
| 302 |
- mysql_disable_test "$t" \ |
| 303 |
+ mysql-v2_disable_test "$t" \ |
| 304 |
"False positives in Gentoo: connect-timeout" |
| 305 |
done |
| 306 |
;; |
| 307 |
esac |
| 308 |
|
| 309 |
use profiling && use community \ |
| 310 |
- || mysql_disable_test main.profiling \ |
| 311 |
+ || mysql-v2_disable_test main.profiling \ |
| 312 |
"Profiling test needs profiling support" |
| 313 |
|
| 314 |
if [ "${PN}" == "mariadb" ]; then |
| 315 |
for t in \ |
| 316 |
parts.part_supported_sql_func_ndb \ |
| 317 |
parts.partition_auto_increment_ndb ; do |
| 318 |
- mysql_disable_test $t "ndb not supported in mariadb" |
| 319 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
| 320 |
done |
| 321 |
fi |
| 322 |
|
| 323 |
@@ -213,14 +213,14 @@ src_test() { |
| 324 |
innodb.innodb_bug49164 innodb.innodb_bug51920 \ |
| 325 |
innodb.innodb_bug54044 \ |
| 326 |
; do |
| 327 |
- mysql_disable_test $t "tests broken in xtradb" |
| 328 |
+ mysql-v2_disable_test $t "tests broken in xtradb" |
| 329 |
done |
| 330 |
fi |
| 331 |
|
| 332 |
# bug 332565 |
| 333 |
if ! use extraengine ; then |
| 334 |
for t in main.range ; do |
| 335 |
- mysql_disable_test $t "Test $t requires USE=extraengine" |
| 336 |
+ mysql-v2_disable_test $t "Test $t requires USE=extraengine" |
| 337 |
done |
| 338 |
fi |
| 339 |
|
| 340 |
|
| 341 |
diff --git a/dev-db/mysql/mysql-5.5.13.ebuild b/dev-db/mysql/mysql-5.5.13.ebuild |
| 342 |
index b431953..c39e4d8 100644 |
| 343 |
--- a/dev-db/mysql/mysql-5.5.13.ebuild |
| 344 |
+++ b/dev-db/mysql/mysql-5.5.13.ebuild |
| 345 |
@@ -87,7 +87,7 @@ src_test() { |
| 346 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
| 347 |
main.mysqld--help-notwin main.flush_read_lock_kill \ |
| 348 |
sys_vars.plugin_dir_basic ; do |
| 349 |
- mysql_disable_test "$t" "False positives in Gentoo" |
| 350 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 351 |
done |
| 352 |
|
| 353 |
# Run mysql tests |
| 354 |
|
| 355 |
diff --git a/dev-db/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild |
| 356 |
index b431953..c39e4d8 100644 |
| 357 |
--- a/dev-db/mysql/mysql-5.5.14.ebuild |
| 358 |
+++ b/dev-db/mysql/mysql-5.5.14.ebuild |
| 359 |
@@ -87,7 +87,7 @@ src_test() { |
| 360 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
| 361 |
main.mysqld--help-notwin main.flush_read_lock_kill \ |
| 362 |
sys_vars.plugin_dir_basic ; do |
| 363 |
- mysql_disable_test "$t" "False positives in Gentoo" |
| 364 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 365 |
done |
| 366 |
|
| 367 |
# Run mysql tests |
Archives