1 |
commit: bd4e937a49bde6db34a6c7aea8a7d74c579f471b |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 2 09:05:17 2012 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 2 09:05:17 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=bd4e937a |
7 |
|
8 |
Bump. |
9 |
|
10 |
(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
dev-db/mariadb/Manifest | 4 + |
14 |
dev-db/mariadb/mariadb-5.3.5.ebuild | 174 ++++++++++++++++++++++++++++++++++ |
15 |
dev-db/mariadb/mariadb-5.5.22.ebuild | 171 +++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 349 insertions(+), 0 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
19 |
index 6559d5b..7545171 100644 |
20 |
--- a/dev-db/mariadb/Manifest |
21 |
+++ b/dev-db/mariadb/Manifest |
22 |
@@ -8,6 +8,8 @@ DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a44 |
23 |
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a |
24 |
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad |
25 |
DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2 |
26 |
+DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc8826867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d52d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3 |
27 |
+DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274aa37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016 |
28 |
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 |
29 |
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f |
30 |
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386 |
31 |
@@ -18,5 +20,7 @@ EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301b97f23c3d6d00253a7a01cee0 |
32 |
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6 |
33 |
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6 |
34 |
EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971 |
35 |
+EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df6883345836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382 |
36 |
+EBUILD mariadb-5.5.22.ebuild 5885 RMD160 bd589ea7d8f9f9f51284b259c24e461a2f0ea41b SHA1 f353cae595b5184dbb5514c8238acb4b1da22eca SHA256 a9cef0c80dc97ec6085c8c729b22078d3f51d51ef852218a7e51fef4be0c91e1 |
37 |
MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592 |
38 |
MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a |
39 |
|
40 |
diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb-5.3.5.ebuild |
41 |
new file mode 100644 |
42 |
index 0000000..573efa2 |
43 |
--- /dev/null |
44 |
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild |
45 |
@@ -0,0 +1,174 @@ |
46 |
+# Copyright 1999-2012 Gentoo Foundation |
47 |
+# Distributed under the terms of the GNU General Public License v2 |
48 |
+# $Header: $ |
49 |
+ |
50 |
+MY_EXTRAS_VER="20110819-0415Z" |
51 |
+EAPI="4" |
52 |
+ |
53 |
+# Build system |
54 |
+BUILD="autotools" |
55 |
+ |
56 |
+# Suffix on files... |
57 |
+MY_PV="$PV-ga" |
58 |
+ |
59 |
+inherit toolchain-funcs mysql-v2 |
60 |
+# only to make repoman happy. it is really set in the eclass |
61 |
+IUSE="$IUSE" |
62 |
+ |
63 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
64 |
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" |
65 |
+ |
66 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
67 |
+EPATCH_EXCLUDE='' |
68 |
+ |
69 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
70 |
+RDEPEND="${RDEPEND}" |
71 |
+ |
72 |
+# Please do not add a naive src_unpack to this ebuild |
73 |
+# If you want to add a single patch, copy the ebuild to an overlay |
74 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
75 |
+src_prepare() { |
76 |
+ sed -i \ |
77 |
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \ |
78 |
+ "${S}"/unittest/mytap/t/Makefile.am |
79 |
+ mysql-v2_src_prepare |
80 |
+} |
81 |
+ |
82 |
+# Official test instructions: |
83 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
84 |
+# FEATURES='test userpriv -usersandbox' \ |
85 |
+# ebuild mariadb-X.X.XX.ebuild \ |
86 |
+# digest clean package |
87 |
+src_test() { |
88 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
89 |
+ # localhost. Also causes weird failures. |
90 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
91 |
+ |
92 |
+ emake check || die "make check failed" |
93 |
+ if ! use "minimal" ; then |
94 |
+ if [[ $UID -eq 0 ]]; then |
95 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
96 |
+ fi |
97 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
98 |
+ cd "${S}" |
99 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
100 |
+ local retstatus_unit |
101 |
+ local retstatus_ns |
102 |
+ local retstatus_ps |
103 |
+ local t |
104 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
105 |
+ |
106 |
+ # Ensure that parallel runs don't die |
107 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
108 |
+ |
109 |
+ # The entire 5.0 series has pre-generated SSL certificates, they have |
110 |
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem |
111 |
+ # The certs really SHOULD be generated for the tests, so that they are |
112 |
+ # not expiring like this. We cannot do so ourselves as the tests look |
113 |
+ # closely as the cert path data, and we do not have the CA key to regen |
114 |
+ # ourselves. Alternatively, upstream should generate them with at least |
115 |
+ # 50-year validity. |
116 |
+ # |
117 |
+ # Known expiry points: |
118 |
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 |
119 |
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 |
120 |
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 |
121 |
+ # |
122 |
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be |
123 |
+ # expired/invalid. |
124 |
+ case ${PV} in |
125 |
+ 5.1.*|5.5.*) |
126 |
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
127 |
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
128 |
+ mysql-v2_disable_test \ |
129 |
+ "$t" \ |
130 |
+ "These OpenSSL tests break due to expired certificates" |
131 |
+ done |
132 |
+ ;; |
133 |
+ esac |
134 |
+ |
135 |
+ # These are also failing in MySQL 5.1 for now, and are believed to be |
136 |
+ # false positives: |
137 |
+ # |
138 |
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema, |
139 |
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: |
140 |
+ # fails due to USE=-latin1 / utf8 default |
141 |
+ # |
142 |
+ # main.mysql_client_test: |
143 |
+ # segfaults at random under Portage only, suspect resource limits. |
144 |
+ # |
145 |
+ # main.not_partition: |
146 |
+ # Failure reason unknown at this time, must resolve before package.mask |
147 |
+ # removal FIXME |
148 |
+ case ${PV} in |
149 |
+ 5.1.*|5.2.*|5.3.*|5.5.*) |
150 |
+ for t in main.mysql_client_test main.mysql_comments \ |
151 |
+ main.mysql_upgrade \ |
152 |
+ main.information_schema \ |
153 |
+ main.not_partition funcs_1.is_columns_mysql \ |
154 |
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do |
155 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
156 |
+ done |
157 |
+ ;; |
158 |
+ esac |
159 |
+ |
160 |
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. |
161 |
+ # These tests are picking up a 'connect-timeout' config from somewhere, |
162 |
+ # which is not valid, and since it does not have 'loose-' in front of |
163 |
+ # it, it's causing a failure |
164 |
+ case ${PV} in |
165 |
+ 5.1.5*|5.5.*|6*) |
166 |
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
167 |
+ mysql-v2_disable_test "$t" \ |
168 |
+ "False positives in Gentoo: connect-timeout" |
169 |
+ done |
170 |
+ ;; |
171 |
+ esac |
172 |
+ |
173 |
+ use profiling && use community \ |
174 |
+ || mysql-v2_disable_test main.profiling \ |
175 |
+ "Profiling test needs profiling support" |
176 |
+ |
177 |
+ if [ "${PN}" == "mariadb" ]; then |
178 |
+ for t in \ |
179 |
+ parts.part_supported_sql_func_ndb \ |
180 |
+ parts.partition_auto_increment_ndb ; do |
181 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
182 |
+ done |
183 |
+ fi |
184 |
+ |
185 |
+ # create directories because mysqladmin might make out of order |
186 |
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |
187 |
+ |
188 |
+ # We run the test protocols seperately |
189 |
+ emake test-unit |
190 |
+ retstatus_unit=$? |
191 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
192 |
+ |
193 |
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" |
194 |
+ retstatus_ns=$? |
195 |
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" |
196 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
197 |
+ |
198 |
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" |
199 |
+ retstatus_ps=$? |
200 |
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" |
201 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
202 |
+ |
203 |
+ # TODO: |
204 |
+ # When upstream enables the pr and nr testsuites, we need those as well. |
205 |
+ |
206 |
+ # Cleanup is important for these testcases. |
207 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
208 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
209 |
+ failures="" |
210 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
211 |
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" |
212 |
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" |
213 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
214 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
215 |
+ einfo "Tests successfully completed" |
216 |
+ else |
217 |
+ einfo "Skipping server tests due to minimal build." |
218 |
+ fi |
219 |
+} |
220 |
|
221 |
diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild |
222 |
new file mode 100644 |
223 |
index 0000000..411f56a |
224 |
--- /dev/null |
225 |
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild |
226 |
@@ -0,0 +1,171 @@ |
227 |
+# Copyright 1999-2012 Gentoo Foundation |
228 |
+# Distributed under the terms of the GNU General Public License v2 |
229 |
+# $Header: $ |
230 |
+ |
231 |
+MY_EXTRAS_VER="20110819-0415Z" |
232 |
+EAPI="4" |
233 |
+ |
234 |
+# Build system |
235 |
+BUILD="cmake" |
236 |
+ |
237 |
+inherit toolchain-funcs mysql-v2 |
238 |
+# only to make repoman happy. it is really set in the eclass |
239 |
+IUSE="$IUSE" |
240 |
+ |
241 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
242 |
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" |
243 |
+ |
244 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
245 |
+EPATCH_EXCLUDE='' |
246 |
+ |
247 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
248 |
+RDEPEND="${RDEPEND}" |
249 |
+ |
250 |
+# Please do not add a naive src_unpack to this ebuild |
251 |
+# If you want to add a single patch, copy the ebuild to an overlay |
252 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
253 |
+src_prepare() { |
254 |
+ sed -i \ |
255 |
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \ |
256 |
+ "${S}"/unittest/mytap/t/Makefile.am |
257 |
+ mysql-v2_src_prepare |
258 |
+} |
259 |
+ |
260 |
+# Official test instructions: |
261 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
262 |
+# FEATURES='test userpriv -usersandbox' \ |
263 |
+# ebuild mariadb-X.X.XX.ebuild \ |
264 |
+# digest clean package |
265 |
+src_test() { |
266 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
267 |
+ # localhost. Also causes weird failures. |
268 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
269 |
+ |
270 |
+ emake check || die "make check failed" |
271 |
+ if ! use "minimal" ; then |
272 |
+ if [[ $UID -eq 0 ]]; then |
273 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
274 |
+ fi |
275 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
276 |
+ cd "${S}" |
277 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
278 |
+ local retstatus_unit |
279 |
+ local retstatus_ns |
280 |
+ local retstatus_ps |
281 |
+ local t |
282 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
283 |
+ |
284 |
+ # Ensure that parallel runs don't die |
285 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
286 |
+ |
287 |
+ # The entire 5.0 series has pre-generated SSL certificates, they have |
288 |
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem |
289 |
+ # The certs really SHOULD be generated for the tests, so that they are |
290 |
+ # not expiring like this. We cannot do so ourselves as the tests look |
291 |
+ # closely as the cert path data, and we do not have the CA key to regen |
292 |
+ # ourselves. Alternatively, upstream should generate them with at least |
293 |
+ # 50-year validity. |
294 |
+ # |
295 |
+ # Known expiry points: |
296 |
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 |
297 |
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 |
298 |
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 |
299 |
+ # |
300 |
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be |
301 |
+ # expired/invalid. |
302 |
+ case ${PV} in |
303 |
+ 5.1.*|5.5.*) |
304 |
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
305 |
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
306 |
+ mysql-v2_disable_test \ |
307 |
+ "$t" \ |
308 |
+ "These OpenSSL tests break due to expired certificates" |
309 |
+ done |
310 |
+ ;; |
311 |
+ esac |
312 |
+ |
313 |
+ # These are also failing in MySQL 5.1 for now, and are believed to be |
314 |
+ # false positives: |
315 |
+ # |
316 |
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema, |
317 |
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: |
318 |
+ # fails due to USE=-latin1 / utf8 default |
319 |
+ # |
320 |
+ # main.mysql_client_test: |
321 |
+ # segfaults at random under Portage only, suspect resource limits. |
322 |
+ # |
323 |
+ # main.not_partition: |
324 |
+ # Failure reason unknown at this time, must resolve before package.mask |
325 |
+ # removal FIXME |
326 |
+ case ${PV} in |
327 |
+ 5.1.*|5.2.*|5.3.*|5.5.*) |
328 |
+ for t in main.mysql_client_test main.mysql_comments \ |
329 |
+ main.mysql_upgrade \ |
330 |
+ main.information_schema \ |
331 |
+ main.not_partition funcs_1.is_columns_mysql \ |
332 |
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do |
333 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
334 |
+ done |
335 |
+ ;; |
336 |
+ esac |
337 |
+ |
338 |
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. |
339 |
+ # These tests are picking up a 'connect-timeout' config from somewhere, |
340 |
+ # which is not valid, and since it does not have 'loose-' in front of |
341 |
+ # it, it's causing a failure |
342 |
+ case ${PV} in |
343 |
+ 5.1.5*|5.5.*|6*) |
344 |
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
345 |
+ mysql-v2_disable_test "$t" \ |
346 |
+ "False positives in Gentoo: connect-timeout" |
347 |
+ done |
348 |
+ ;; |
349 |
+ esac |
350 |
+ |
351 |
+ use profiling && use community \ |
352 |
+ || mysql-v2_disable_test main.profiling \ |
353 |
+ "Profiling test needs profiling support" |
354 |
+ |
355 |
+ if [ "${PN}" == "mariadb" ]; then |
356 |
+ for t in \ |
357 |
+ parts.part_supported_sql_func_ndb \ |
358 |
+ parts.partition_auto_increment_ndb ; do |
359 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
360 |
+ done |
361 |
+ fi |
362 |
+ |
363 |
+ # create directories because mysqladmin might make out of order |
364 |
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |
365 |
+ |
366 |
+ # We run the test protocols seperately |
367 |
+ emake test-unit |
368 |
+ retstatus_unit=$? |
369 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
370 |
+ |
371 |
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" |
372 |
+ retstatus_ns=$? |
373 |
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" |
374 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
375 |
+ |
376 |
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" |
377 |
+ retstatus_ps=$? |
378 |
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" |
379 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
380 |
+ |
381 |
+ # TODO: |
382 |
+ # When upstream enables the pr and nr testsuites, we need those as well. |
383 |
+ |
384 |
+ # Cleanup is important for these testcases. |
385 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
386 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
387 |
+ failures="" |
388 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
389 |
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" |
390 |
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" |
391 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
392 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
393 |
+ einfo "Tests successfully completed" |
394 |
+ else |
395 |
+ einfo "Skipping server tests due to minimal build." |
396 |
+ fi |
397 |
+} |