1 |
grknight 14/08/30 00:53:55 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mysql-5.6.20-r1.ebuild |
5 |
Log: |
6 |
Revision bump to enable multilib |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.689 dev-db/mysql/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.689&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.689&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?r1=1.688&r2=1.689 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v |
20 |
retrieving revision 1.688 |
21 |
retrieving revision 1.689 |
22 |
diff -u -r1.688 -r1.689 |
23 |
--- ChangeLog 28 Aug 2014 14:06:54 -0000 1.688 |
24 |
+++ ChangeLog 30 Aug 2014 00:53:55 -0000 1.689 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for dev-db/mysql |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.688 2014/08/28 14:06:54 grknight Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.689 2014/08/30 00:53:55 grknight Exp $ |
30 |
+ |
31 |
+*mysql-5.6.20-r1 (30 Aug 2014) |
32 |
+ |
33 |
+ 30 Aug 2014; Brian Evans <grknight@g.o> +mysql-5.6.20-r1.ebuild: |
34 |
+ Revision bump to enable multilib |
35 |
|
36 |
28 Aug 2014; <grknight@g.o> -files/mysql-5.5.32-Werror.patch, |
37 |
files/my.cnf-5.5: |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-db/mysql/mysql-5.6.20-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.20-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.20-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: mysql-5.6.20-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20-r1.ebuild,v 1.1 2014/08/30 00:53:55 grknight Exp $ |
51 |
|
52 |
EAPI="5" |
53 |
|
54 |
MY_EXTRAS_VER="20140801-1950Z" |
55 |
MY_PV="${PV//_alpha_pre/-m}" |
56 |
MY_PV="${MY_PV//_/-}" |
57 |
|
58 |
inherit toolchain-funcs mysql-multilib |
59 |
# only to make repoman happy. it is really set in the eclass |
60 |
IUSE="$IUSE" |
61 |
|
62 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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" |
64 |
|
65 |
# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
66 |
EPATCH_EXCLUDE='' |
67 |
|
68 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
69 |
RDEPEND="${RDEPEND}" |
70 |
|
71 |
# Please do not add a naive src_unpack to this ebuild |
72 |
# If you want to add a single patch, copy the ebuild to an overlay |
73 |
# and create your own mysql-extras tarball, looking at 000_index.txt |
74 |
|
75 |
# Official test instructions: |
76 |
# USE='-cluster embedded extraengine perl ssl static-libs community' \ |
77 |
# FEATURES='test userpriv -usersandbox' \ |
78 |
# ebuild mysql-X.X.XX.ebuild \ |
79 |
# digest clean package |
80 |
multilib_src_test() { |
81 |
|
82 |
if ! multilib_is_native_abi ; then |
83 |
einfo "Server tests not available on non-native abi". |
84 |
return 0; |
85 |
fi |
86 |
|
87 |
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
88 |
local retstatus_unit |
89 |
local retstatus_tests |
90 |
|
91 |
# Bug #213475 - MySQL _will_ object strenously if your machine is named |
92 |
# localhost. Also causes weird failures. |
93 |
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
94 |
|
95 |
if ! use "minimal" ; then |
96 |
|
97 |
if [[ $UID -eq 0 ]]; then |
98 |
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
99 |
fi |
100 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
101 |
|
102 |
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
103 |
addpredict /this-dir-does-not-exist/t9.MYI |
104 |
|
105 |
# Run CTest (test-units) |
106 |
cmake-utils_src_test |
107 |
retstatus_unit=$? |
108 |
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
109 |
|
110 |
# Ensure that parallel runs don't die |
111 |
export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
112 |
# Enable parallel testing, auto will try to detect number of cores |
113 |
# You may set this by hand. |
114 |
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
115 |
export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
116 |
|
117 |
# create directories because mysqladmin might right out of order |
118 |
mkdir -p "${S}"/mysql-test/var-tests{,/log} |
119 |
|
120 |
# create symlink for the tests to find mysql_tzinfo_to_sql |
121 |
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
122 |
|
123 |
# These are failing in MySQL 5.5/5.6 for now and are believed to be |
124 |
# false positives: |
125 |
# |
126 |
# main.information_schema, binlog.binlog_statement_insert_delayed, |
127 |
# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql, |
128 |
# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, |
129 |
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, |
130 |
# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql |
131 |
# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter |
132 |
# fails due to USE=-latin1 / utf8 default |
133 |
# |
134 |
# main.mysql_client_test: |
135 |
# segfaults at random under Portage only, suspect resource limits. |
136 |
# |
137 |
# rpl.rpl_plugin_load |
138 |
# fails due to included file not listed in expected result |
139 |
# appears to be poor planning |
140 |
for t in \ |
141 |
binlog.binlog_mysqlbinlog_filter \ |
142 |
binlog.binlog_statement_insert_delayed \ |
143 |
funcs_1.is_columns_mysql \ |
144 |
funcs_1.is_tables_mysql \ |
145 |
funcs_1.is_triggers \ |
146 |
main.information_schema \ |
147 |
main.mysql_client_test \ |
148 |
main.mysqld--help-notwinfuncs_1.is_triggers \ |
149 |
mysqld--help-notwin \ |
150 |
perfschema.binlog_edge_mix \ |
151 |
perfschema.binlog_edge_stmt \ |
152 |
rpl.rpl_plugin_load \ |
153 |
; do |
154 |
mysql-multilib_disable_test "$t" "False positives in Gentoo" |
155 |
done |
156 |
|
157 |
# Run mysql tests |
158 |
pushd "${TESTDIR}" |
159 |
|
160 |
# Set file limits higher so tests run |
161 |
ulimit -n 3000 |
162 |
|
163 |
# run mysql-test tests |
164 |
perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
165 |
--suite-timeout=5000 |
166 |
retstatus_tests=$? |
167 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
168 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
169 |
|
170 |
popd |
171 |
|
172 |
# Cleanup is important for these testcases. |
173 |
pkill -9 -f "${S}/ndb" 2>/dev/null |
174 |
pkill -9 -f "${S}/sql" 2>/dev/null |
175 |
|
176 |
failures="" |
177 |
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
178 |
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
179 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
180 |
|
181 |
[[ -z "$failures" ]] || die "Test failures: $failures" |
182 |
einfo "Tests successfully completed" |
183 |
|
184 |
else |
185 |
|
186 |
einfo "Skipping server tests due to minimal build." |
187 |
fi |
188 |
} |