1 |
commit: 5c31dfeb9c12d412d544c7303e90593e9e46768e |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 3 13:28:22 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 3 13:28:22 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5c31dfeb |
7 |
|
8 |
Sync with tree for test changes |
9 |
|
10 |
--- |
11 |
dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild | 4 +++- |
12 |
dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild | 4 +++- |
13 |
dev-db/mariadb/mariadb-10.0.12.ebuild | 4 +++- |
14 |
dev-db/mariadb/mariadb-10.0.14.ebuild | 9 +++++---- |
15 |
dev-db/mariadb/mariadb-10.1.0_alpha.ebuild | 2 ++ |
16 |
dev-db/mariadb/mariadb-5.5.39.ebuild | 8 +++++--- |
17 |
dev-db/mariadb/mariadb-9999.ebuild | 2 ++ |
18 |
dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild | 6 ++++-- |
19 |
dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild | 4 +++- |
20 |
dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild | 6 ++++-- |
21 |
dev-db/mysql/mysql-5.5.39.ebuild | 4 +++- |
22 |
dev-db/mysql/mysql-5.5.40.ebuild | 4 +++- |
23 |
dev-db/mysql/mysql-5.6.21.ebuild | 4 +++- |
24 |
dev-db/percona-server/percona-server-5.6.20.68.0.ebuild | 4 +++- |
25 |
14 files changed, 46 insertions(+), 19 deletions(-) |
26 |
|
27 |
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild |
28 |
index d323bb0..69e1e8f 100644 |
29 |
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild |
30 |
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild |
31 |
@@ -1,6 +1,6 @@ |
32 |
# Copyright 1999-2014 Gentoo Foundation |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v 1.1 2014/07/30 06:26:21 robbat2 Exp $ |
35 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v 1.2 2014/10/02 02:33:56 grknight Exp $ |
36 |
|
37 |
EAPI="5" |
38 |
MY_EXTRAS_VER="20140729-2200Z" |
39 |
@@ -109,6 +109,8 @@ src_test() { |
40 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
41 |
einfo "Tests successfully completed" |
42 |
|
43 |
+ # Cleanup data files after tests |
44 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
45 |
else |
46 |
|
47 |
einfo "Skipping server tests due to minimal build." |
48 |
|
49 |
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild |
50 |
index bcc41bc..7ee77dc 100644 |
51 |
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild |
52 |
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2014 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.1 2014/09/03 22:44:00 grknight Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.2 2014/10/02 02:33:56 grknight Exp $ |
58 |
|
59 |
EAPI="5" |
60 |
MY_EXTRAS_VER="20140903-1928Z" |
61 |
@@ -117,6 +117,8 @@ multilib_src_test() { |
62 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
63 |
einfo "Tests successfully completed" |
64 |
|
65 |
+ # Cleanup data files after tests |
66 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
67 |
else |
68 |
|
69 |
einfo "Skipping server tests due to minimal build." |
70 |
|
71 |
diff --git a/dev-db/mariadb/mariadb-10.0.12.ebuild b/dev-db/mariadb/mariadb-10.0.12.ebuild |
72 |
index 6107125..97c92b9 100644 |
73 |
--- a/dev-db/mariadb/mariadb-10.0.12.ebuild |
74 |
+++ b/dev-db/mariadb/mariadb-10.0.12.ebuild |
75 |
@@ -1,6 +1,6 @@ |
76 |
# Copyright 1999-2014 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
-# $Header: $ |
79 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild,v 1.5 2014/10/02 02:32:22 grknight Exp $ |
80 |
|
81 |
EAPI="5" |
82 |
MY_EXTRAS_VER="20140729-2200Z" |
83 |
@@ -104,6 +104,8 @@ src_test() { |
84 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
85 |
einfo "Tests successfully completed" |
86 |
|
87 |
+ # Cleanup data files after tests |
88 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
89 |
else |
90 |
|
91 |
einfo "Skipping server tests due to minimal build." |
92 |
|
93 |
diff --git a/dev-db/mariadb/mariadb-10.0.14.ebuild b/dev-db/mariadb/mariadb-10.0.14.ebuild |
94 |
index 8fe9f86..5251680 100644 |
95 |
--- a/dev-db/mariadb/mariadb-10.0.14.ebuild |
96 |
+++ b/dev-db/mariadb/mariadb-10.0.14.ebuild |
97 |
@@ -1,6 +1,6 @@ |
98 |
# Copyright 1999-2014 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.1 2014/09/26 19:07:01 grknight Exp $ |
101 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.2 2014/10/02 02:32:22 grknight Exp $ |
102 |
|
103 |
EAPI="5" |
104 |
MY_EXTRAS_VER="20140924-1913Z" |
105 |
@@ -88,9 +88,8 @@ multilib_src_test() { |
106 |
pushd "${TESTDIR}" |
107 |
|
108 |
# run mysql-test tests |
109 |
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files |
110 |
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
111 |
- --skip-test=connect |
112 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
113 |
+ |
114 |
retstatus_tests=$? |
115 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
116 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
117 |
@@ -109,6 +108,8 @@ multilib_src_test() { |
118 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
119 |
einfo "Tests successfully completed" |
120 |
|
121 |
+ # Cleanup data files after tests |
122 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
123 |
else |
124 |
|
125 |
einfo "Skipping server tests due to minimal build." |
126 |
|
127 |
diff --git a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild |
128 |
index ad99d88..de30276 100644 |
129 |
--- a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild |
130 |
+++ b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild |
131 |
@@ -102,6 +102,8 @@ multilib_src_test() { |
132 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
133 |
einfo "Tests successfully completed" |
134 |
|
135 |
+ # Cleanup test data after a successful run |
136 |
+ rm -r "${S}/mysql-test/var-tests" |
137 |
else |
138 |
|
139 |
einfo "Skipping server tests due to minimal build." |
140 |
|
141 |
diff --git a/dev-db/mariadb/mariadb-5.5.39.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild |
142 |
index 24aa609..45a6ecc 100644 |
143 |
--- a/dev-db/mariadb/mariadb-5.5.39.ebuild |
144 |
+++ b/dev-db/mariadb/mariadb-5.5.39.ebuild |
145 |
@@ -1,9 +1,9 @@ |
146 |
# Copyright 1999-2014 Gentoo Foundation |
147 |
# Distributed under the terms of the GNU General Public License v2 |
148 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.1 2014/08/05 17:40:30 grknight Exp $ |
149 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.8 2014/10/02 02:32:22 grknight Exp $ |
150 |
|
151 |
EAPI="5" |
152 |
-MY_EXTRAS_VER="20140729-0112Z" |
153 |
+MY_EXTRAS_VER="20140817-2320Z" |
154 |
|
155 |
# Build system |
156 |
BUILD="cmake" |
157 |
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2 |
158 |
IUSE="$IUSE" |
159 |
|
160 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
161 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
162 |
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
163 |
|
164 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
165 |
EPATCH_EXCLUDE='' |
166 |
@@ -107,6 +107,8 @@ src_test() { |
167 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
168 |
einfo "Tests successfully completed" |
169 |
|
170 |
+ # Cleanup data files after tests |
171 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
172 |
else |
173 |
|
174 |
einfo "Skipping server tests due to minimal build." |
175 |
|
176 |
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild |
177 |
index 0a47c74..252b2d7 100644 |
178 |
--- a/dev-db/mariadb/mariadb-9999.ebuild |
179 |
+++ b/dev-db/mariadb/mariadb-9999.ebuild |
180 |
@@ -109,6 +109,8 @@ multilib_src_test() { |
181 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
182 |
einfo "Tests successfully completed" |
183 |
|
184 |
+ # Cleanup test data after a successful run |
185 |
+ rm -r "${S}/mysql-test/var-tests" |
186 |
else |
187 |
|
188 |
einfo "Skipping server tests due to minimal build." |
189 |
|
190 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild |
191 |
index e94ac90..e3176dc 100644 |
192 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild |
193 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild |
194 |
@@ -1,9 +1,9 @@ |
195 |
# Copyright 1999-2014 Gentoo Foundation |
196 |
# Distributed under the terms of the GNU General Public License v2 |
197 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $ |
198 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $ |
199 |
|
200 |
EAPI=4 |
201 |
-MY_EXTRAS_VER="live" |
202 |
+MY_EXTRAS_VER="none" |
203 |
BUILD="cmake" |
204 |
|
205 |
# PBXT |
206 |
@@ -122,6 +122,8 @@ src_test() { |
207 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
208 |
einfo "Tests successfully completed" |
209 |
|
210 |
+ # Cleanup data files after tests |
211 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
212 |
else |
213 |
|
214 |
einfo "Skipping server tests due to minimal build." |
215 |
|
216 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild |
217 |
index 5b579f5..e803baa 100644 |
218 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild |
219 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild |
220 |
@@ -1,6 +1,6 @@ |
221 |
# Copyright 1999-2014 Gentoo Foundation |
222 |
# Distributed under the terms of the GNU General Public License v2 |
223 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.1 2014/08/31 20:59:52 grknight Exp $ |
224 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.2 2014/10/02 02:38:28 grknight Exp $ |
225 |
|
226 |
EAPI=5 |
227 |
MY_EXTRAS_VER="20140801-1950Z" |
228 |
@@ -127,6 +127,8 @@ multilib_src_test() { |
229 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
230 |
einfo "Tests successfully completed" |
231 |
|
232 |
+ # Cleanup data files after tests |
233 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
234 |
else |
235 |
|
236 |
einfo "Skipping server tests due to minimal build." |
237 |
|
238 |
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild |
239 |
index faa725e..1eaba79 100644 |
240 |
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild |
241 |
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild |
242 |
@@ -1,9 +1,9 @@ |
243 |
# Copyright 1999-2014 Gentoo Foundation |
244 |
# Distributed under the terms of the GNU General Public License v2 |
245 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $ |
246 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $ |
247 |
|
248 |
EAPI=4 |
249 |
-MY_EXTRAS_VER="live" |
250 |
+MY_EXTRAS_VER="none" |
251 |
BUILD="cmake" |
252 |
|
253 |
# PBXT |
254 |
@@ -129,6 +129,8 @@ src_test() { |
255 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
256 |
einfo "Tests successfully completed" |
257 |
|
258 |
+ # Cleanup data files after tests |
259 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
260 |
else |
261 |
|
262 |
einfo "Skipping server tests due to minimal build." |
263 |
|
264 |
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild |
265 |
index 6044dd5..dad2220 100644 |
266 |
--- a/dev-db/mysql/mysql-5.5.39.ebuild |
267 |
+++ b/dev-db/mysql/mysql-5.5.39.ebuild |
268 |
@@ -1,6 +1,6 @@ |
269 |
# Copyright 1999-2014 Gentoo Foundation |
270 |
# Distributed under the terms of the GNU General Public License v2 |
271 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.10 2014/08/13 15:26:18 maekke Exp $ |
272 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.11 2014/10/02 02:25:50 grknight Exp $ |
273 |
|
274 |
EAPI="5" |
275 |
|
276 |
@@ -128,6 +128,8 @@ src_test() { |
277 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
278 |
einfo "Tests successfully completed" |
279 |
|
280 |
+ # Cleanup data files after tests |
281 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
282 |
else |
283 |
|
284 |
einfo "Skipping server tests due to minimal build." |
285 |
|
286 |
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild |
287 |
index f31e03c..58289a9 100644 |
288 |
--- a/dev-db/mysql/mysql-5.5.40.ebuild |
289 |
+++ b/dev-db/mysql/mysql-5.5.40.ebuild |
290 |
@@ -1,6 +1,6 @@ |
291 |
# Copyright 1999-2014 Gentoo Foundation |
292 |
# Distributed under the terms of the GNU General Public License v2 |
293 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.1 2014/09/24 02:36:50 grknight Exp $ |
294 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $ |
295 |
|
296 |
EAPI="5" |
297 |
|
298 |
@@ -114,6 +114,8 @@ src_test() { |
299 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
300 |
einfo "Tests successfully completed" |
301 |
|
302 |
+ # Cleanup data files after tests |
303 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
304 |
else |
305 |
|
306 |
einfo "Skipping server tests due to minimal build." |
307 |
|
308 |
diff --git a/dev-db/mysql/mysql-5.6.21.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild |
309 |
index a5b45fa..0fc09a9 100644 |
310 |
--- a/dev-db/mysql/mysql-5.6.21.ebuild |
311 |
+++ b/dev-db/mysql/mysql-5.6.21.ebuild |
312 |
@@ -1,6 +1,6 @@ |
313 |
# Copyright 1999-2014 Gentoo Foundation |
314 |
# Distributed under the terms of the GNU General Public License v2 |
315 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.1 2014/09/24 03:20:19 grknight Exp $ |
316 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $ |
317 |
|
318 |
EAPI="5" |
319 |
|
320 |
@@ -133,6 +133,8 @@ multilib_src_test() { |
321 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
322 |
einfo "Tests successfully completed" |
323 |
|
324 |
+ # Cleanup data files after tests |
325 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
326 |
else |
327 |
|
328 |
einfo "Skipping server tests due to minimal build." |
329 |
|
330 |
diff --git a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild |
331 |
index c2f5f74..f5636de 100644 |
332 |
--- a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild |
333 |
+++ b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild |
334 |
@@ -1,6 +1,6 @@ |
335 |
# Copyright 1999-2014 Gentoo Foundation |
336 |
# Distributed under the terms of the GNU General Public License v2 |
337 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.1 2014/08/30 00:05:31 grknight Exp $ |
338 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.2 2014/10/02 02:39:57 grknight Exp $ |
339 |
|
340 |
EAPI="5" |
341 |
MY_EXTRAS_VER="20140817-2331Z" |
342 |
@@ -123,6 +123,8 @@ multilib_src_test() { |
343 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
344 |
einfo "Tests successfully completed" |
345 |
|
346 |
+ # Cleanup data files after tests |
347 |
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed" |
348 |
else |
349 |
|
350 |
einfo "Skipping server tests due to minimal build." |