Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Mon, 28 Jan 2013 18:58:24
Message-Id: 1359399494.a572c7dbff1b33f0d4a7059f6c864c0c69dee7f7.robbat2@gentoo
1 commit: a572c7dbff1b33f0d4a7059f6c864c0c69dee7f7
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 28 18:58:14 2013 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 28 18:58:14 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a572c7db
7
8 Add still-broken 5.6 for development. As a problem with as-needed link order still.
9
10 Package-Manager: portage-2.2.0_alpha159
11 RepoMan-Options: --force
12
13 ---
14 dev-db/mysql/ChangeLog | 6 ++
15 dev-db/mysql/Manifest | 1 +
16 dev-db/mysql/mysql-5.6.9_rc.ebuild | 119 ++++++++++++++++++++++++++++++++++++
17 3 files changed, 126 insertions(+), 0 deletions(-)
18
19 diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
20 index 0473c77..2ec6bb7 100644
21 --- a/dev-db/mysql/ChangeLog
22 +++ b/dev-db/mysql/ChangeLog
23 @@ -2,6 +2,12 @@
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 +*mysql-5.6.9_rc (28 Jan 2013)
28 +
29 + 28 Jan 2013; Robin H. Johnson <robbat2@g.o> +mysql-5.6.9_rc.ebuild:
30 + Add still-broken 5.6 for development. As a problem with as-needed link order
31 + still.
32 +
33 28 Jan 2013; Robin H. Johnson <robbat2@g.o> files/my.cnf-4.0,
34 files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild,
35 mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild:
36
37 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
38 index 49c0da5..87a0ac8 100644
39 --- a/dev-db/mysql/Manifest
40 +++ b/dev-db/mysql/Manifest
41 @@ -3,6 +3,7 @@ DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f472
42 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
43 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
44 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
45 +DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
46 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
47 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
48 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
49
50 diff --git a/dev-db/mysql/mysql-5.6.9_rc.ebuild b/dev-db/mysql/mysql-5.6.9_rc.ebuild
51 new file mode 100644
52 index 0000000..496dc33
53 --- /dev/null
54 +++ b/dev-db/mysql/mysql-5.6.9_rc.ebuild
55 @@ -0,0 +1,119 @@
56 +# Copyright 1999-2013 Gentoo Foundation
57 +# Distributed under the terms of the GNU General Public License v2
58 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
59 +
60 +EAPI="4"
61 +
62 +MY_EXTRAS_VER="live"
63 +MY_PV="${PV//_alpha_pre/-m}"
64 +MY_PV="${MY_PV//_/-}"
65 +
66 +# Build type
67 +BUILD="cmake"
68 +
69 +inherit toolchain-funcs mysql-v2
70 +# only to make repoman happy. it is really set in the eclass
71 +IUSE="$IUSE"
72 +
73 +# Define the mysql-extras source
74 +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
75 +
76 +# REMEMBER: also update eclass/mysql*.eclass before committing!
77 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
78 +
79 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
80 +EPATCH_EXCLUDE=''
81 +
82 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
83 +RDEPEND="${RDEPEND}"
84 +
85 +# Please do not add a naive src_unpack to this ebuild
86 +# If you want to add a single patch, copy the ebuild to an overlay
87 +# and create your own mysql-extras tarball, looking at 000_index.txt
88 +
89 +# Official test instructions:
90 +# USE='berkdb -cluster embedded extraengine perl ssl community' \
91 +# FEATURES='test userpriv -usersandbox' \
92 +# ebuild mysql-X.X.XX.ebuild \
93 +# digest clean package
94 +src_test() {
95 +
96 + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
97 + local retstatus_unit
98 + local retstatus_tests
99 +
100 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
101 + # localhost. Also causes weird failures.
102 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
103 +
104 + if ! use "minimal" ; then
105 +
106 + if [[ $UID -eq 0 ]]; then
107 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
108 + fi
109 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
110 +
111 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
112 + addpredict /this-dir-does-not-exist/t9.MYI
113 +
114 + # Run CTest (test-units)
115 + cmake-utils_src_test
116 + retstatus_unit=$?
117 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
118 +
119 + # Ensure that parallel runs don't die
120 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
121 +
122 + # create directories because mysqladmin might right out of order
123 + mkdir -p "${S}"/mysql-test/var-tests{,/log}
124 +
125 + # These are failing in MySQL 5.5 for now and are believed to be
126 + # false positives:
127 + #
128 + # main.information_schema, binlog.binlog_statement_insert_delayed,
129 + # main.mysqld--help-notwin
130 + # fails due to USE=-latin1 / utf8 default
131 + #
132 + # main.mysql_client_test:
133 + # segfaults at random under Portage only, suspect resource limits.
134 + #
135 + # sys_vars.plugin_dir_basic
136 + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
137 + # instead of MYSQL_LIBDIR/plugin
138 + #
139 + # main.flush_read_lock_kill
140 + # fails because of unknown system variable 'DEBUG_SYNC'
141 + for t in main.mysql_client_test \
142 + binlog.binlog_statement_insert_delayed main.information_schema \
143 + main.mysqld--help-notwin; do
144 + mysql_disable_test "$t" "False positives in Gentoo"
145 + done
146 +
147 + # Run mysql tests
148 + pushd "${TESTDIR}"
149 +
150 + # run mysql-test tests
151 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
152 + retstatus_tests=$?
153 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
154 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
155 +
156 + popd
157 +
158 + # Cleanup is important for these testcases.
159 + pkill -9 -f "${S}/ndb" 2>/dev/null
160 + pkill -9 -f "${S}/sql" 2>/dev/null
161 +
162 + failures=""
163 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
164 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
165 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
166 +
167 + [[ -z "$failures" ]] || die "Test failures: $failures"
168 + einfo "Tests successfully completed"
169 +
170 + else
171 +
172 + einfo "Skipping server tests due to minimal build."
173 + fi
174 +}