diff options
author | Brian Evans <grknight@gentoo.org> | 2015-07-30 04:26:36 +0000 |
---|---|---|
committer | Brian Evans <grknight@gentoo.org> | 2015-07-30 04:26:36 +0000 |
commit | db7b42b43ef831c2bba4b712011b6d8e304a6593 (patch) | |
tree | f458a7a52e958c06eaff31d0585df32c8a433817 /dev-db | |
parent | Add blocker below virtual/mysql-5.6-r4 for new split ebuilds (diff) | |
download | historical-db7b42b43ef831c2bba4b712011b6d8e304a6593.tar.gz historical-db7b42b43ef831c2bba4b712011b6d8e304a6593.tar.bz2 historical-db7b42b43ef831c2bba4b712011b6d8e304a6593.zip |
Version bump for 5.6 series
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mysql/ChangeLog | 9 | ||||
-rw-r--r-- | dev-db/mysql/Manifest | 35 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.6.26-r1.ebuild | 169 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.6.26.ebuild | 162 |
4 files changed, 358 insertions, 17 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 6a9e2c4e699f..c71bf7b71e59 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.743 2015/07/29 19:16:20 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.744 2015/07/30 04:26:27 grknight Exp $ + +*mysql-5.6.26 (30 Jul 2015) +*mysql-5.6.26-r1 (30 Jul 2015) + + 30 Jul 2015; Brian Evans <grknight@gentoo.org> +mysql-5.6.26-r1.ebuild, + +mysql-5.6.26.ebuild: + Version bump for 5.6 series 29 Jul 2015; Brian Evans <grknight@gentoo.org> -mysql-5.5.43.ebuild: Drop vulernable 5.5. version wrt Bug 555478 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index aec561212122..6e1b0754533c 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -8,6 +8,7 @@ DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560 DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011 DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194 +DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22 @@ -17,25 +18,27 @@ EBUILD mysql-5.5.45.ebuild 4294 SHA256 d08b71f799eaf7d2362b2c3a01aea45144cb1a81b EBUILD mysql-5.6.24.ebuild 5232 SHA256 8c083b843aaba3a314cf941c8528bbdb7e379959d0a1799cd901c3db5a452a9c SHA512 07d45850ebed09ee9be14cc05de1fe9a5db6c6ebe63072be082290d3a636273093c001783672e321dd6314ede84db75fd86988f98faf225ef01b242b6157a535 WHIRLPOOL df242e53126a03cfce5fc671c1e579057e328e1a3f0acc0631965e07a1eec1afe533c71dc53c90937d11677aabe7d2ab45d8506bcc3aa47728441b7169faad1b EBUILD mysql-5.6.25-r1.ebuild 5663 SHA256 006374ff5c756a3463348492377312d4787144708380b3f392c93ece26a13d6b SHA512 8b38cf6d117a366b8042bc2055fd139ae0ffd3bae389b77b117f661b4be345fd4811571026d7b53739ffc6af2b38dac7742e8458ea6726f6a2e66b7f946d7d15 WHIRLPOOL 71b8eec1f54aa67852ed1f407139e40179c96884251ceaddb77861ec53ce14ff4df702429e804c88e850c4a57938d832ad1dadce91b234f5dad9a9c490c7edf1 EBUILD mysql-5.6.25.ebuild 5245 SHA256 a3432045b80c8e5cfdc0a509a18f88c23c652a737f2491d0ba946290cf853c46 SHA512 481b5ccbfced31f711f529b8ccce4bdf28c113958ed31a13a9262b6bc3f170f7333bf647e0971eacc3e15c26c742d90a2b26928df4539468f8ed36dd6407818c WHIRLPOOL 216930d9d58d8a6dbedb295c5ba37922d3c4367d09789bea5960bb9c4bccceb3fccb45007a60ad1b0bbf23758633f55c87484179f809c7d8800ac5f015bca8d1 -MISC ChangeLog 26565 SHA256 b9dddb8354bbe29dc8dd693bd9815f88d162171376a20f595641d732171548f4 SHA512 8c86bfb048485d346ab4f8882c7d3d60fc43b28f52bee5a03ede3a6bda3b975e74c0ecde10b9481979cf0e0428a93c64926a62f21bb6383919e4d7e01a880183 WHIRLPOOL 0e197afa450cadbf9b00de67e2cc890abadecbb4ec1d8ae39968fe1cb7b0277e3643d772f1e22a54661b20482af20bfef0229cb8dcb5329495a710ecc07e55e1 +EBUILD mysql-5.6.26-r1.ebuild 5904 SHA256 d9c3621f05f55ea9e293e1a51d9406eee233b301020ea85af7622a64dacd7d8b SHA512 19f6b4d36f31780a0cbfb19b99491a8e764a487be6d60394736abe2f00cb4c323b1483dc788db7f29166b11e6d3d3f0e4fc168acec1f3bef8cc7933b492db91a WHIRLPOOL 3be88ff99ad36c45b3a0ac5d5ab4b4804cf348382679258993410b2aa97b555382c1ddecdd5619b5b04ab457242d46e6469a3a79943dbb6e8532c3c62acc8f84 +EBUILD mysql-5.6.26.ebuild 5509 SHA256 67ac4f69ed31ebfba0b027af423d63f3d316d11bd2e9da80a76a2c6c94f9a1f5 SHA512 1569d77733da849898ee264ebae2ee0ba7f0d4c0c43dc55e083f9f66fe40e6fe0c2604714c86d84927e5ecffea4ec676f18f0b8573c119e07af2af24c2768976 WHIRLPOOL 455752735e9336bccf88bb4df0d9966b205ec8e3bb8e83f5369c7c000f6aecee1573282c5ca061d19536696ed6dcb7dae5cd7e4aa18d4113194993c1d731df94 +MISC ChangeLog 26754 SHA256 2edd75a86e9ab7736a86e667858cd4d7e939cc203e4377a312b1124779d7968f SHA512 94f70f0fc9aa0a5dada94a2de56a6fb9798de7911e167d5294c523fd21112342a4bd63003c20ed7563cfe0e4155b211bcc91fb96039db4b187b6e54f6b118fae WHIRLPOOL 42e4000a6548184fb47c8cfc98f814de1654d1b0c81e992bf98c60e51231ecab8e84d2cbd9e76178535788d6e9ebc92f84cb6a6915bd7f7dd1c6c80b068fe06c MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821 MISC metadata.xml 1411 SHA256 0edc5387d481074924e19441c4a0dffe9308a616f557b7d9f4b9ae71eebf5961 SHA512 5efefdcca328de80c991910046e42174f79ab6038601e75691100267f6d442fc3262be56b3f80d14e9de2fbba8c3c73b39b474671c99e520392f9f7fda3cbedb WHIRLPOOL 7a9aeaf8f04ec7332a7632e1b68eec478e3e81f427e18e98a8b3ec1be6dc00ce37902a33a578bec332cca422c856c61b91063d03f2f1d0b110b142f2cacf7631 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1 +Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVuSdJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVuad4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2G6AP/3UcCUGT999lbjo0Ww4id50q -0hAgXT6yhKkZ5/GmDFJCGrnYZ6iG4TKxs3Xmr9Dcd8RDPI9PCJQRyeZbJfrV8qPr -rh+K+t2tLcWGY8SYhfWdhSZsxXYq627e11BaEGBfYIYQMiV2lpbKbN9O/ugm7Icy -Cszig/N5l7CpjujdlvUbw1C2rgnEXofy2VgZkedo4sxPuzNdQm8NpEXjK/mVGYSw -hVGj9qrgDL0RF8+D8AOgJ9FDijEp86vSrcKTtRXWVpoO3MtNnKX9YwHEKtFTh3jz -c4e6Aj+dNNN/0w5BeytxbQg1jkLIdhbmTeVRjgZiiJB7cpe+WzWDEb1lTa/RjAHc -7IryJOA0wVS5o7Mg1EDQ+p5ynkbzXreeI1JbWhGDFnZVTz66IvqqXXUo1cUuehR9 -Y9EOW1kLXG7Snz8T06eVezayyz7fJ4rQ/NPZk4/xr039IaJ5Bf2KhcpXjFDT+yed -rMPp1bpNClokSAggqjJgOBwuxVAbQE09npffM7Z+i68DbCvtjN5/7I24PCgNRZsp -YA2prOJBYFE2bkDc+mVlCG1KAMSV8Xl18+Cccqf6UbTiKbwlC5KxXqK7GpQZpKK3 -eSKkwec/Jer+gjp1w9waulwtmzVOlMEXvrH8gH0k7dQOVSOUYe3nDYB56I9lWYJW -nD5CAagkZUUa0bwRNV1C -=OirK +MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2wA4P/i86knuqS00X3F91MrzWEJ1X +dnbTJ0mvA+Z9vvtM0E2dT+Ztq8KZuIJxzbe5iKKAa9wS8qbX+JGptXV7+Ql9IaHx +k9ik02NvKh9/o3YiqEzuZi8sgyd5KH73zs0GWklxLwumtRNLfCEA8icGss4yH9Yo +qVPZtUn67SPTUF/Jp2L0yFlDvpTc28vvhmcUhtT655sRQp9ec0KVm11UXFQ8dT7c +VCF8NgRK9q6u0S/pj76ALYTEywOOw11/Vza5RBXRpmoXGY/1zyy7LfPRU2Ta/XTH +j48dGTYe0xI3TS89ntLE2iQKknQ5lke3tVIPxfZ03lQU8/CAOMpLpcB6/L4Vk6XI +g2JViO/4qIhBR0M9EWpVoo5wPu99PlD39hixLj4naTYF7bU563e+kF6Hq2ks44WF +7n3BjY/f2bGTHE7TI/E6PkEXdS4KwSGMao1HwdYR5ISDtyN3uUWxRcLeYukHv0qP +H7ezwxyWTgFcykxWnTDNlDkFSfc8zX1sowHScIyTvX7onrPosBrq1AK5c1mtyfuN +PwL976leOgWHWYQS/WrsDc9QKa4WwvZBeJZ5SWi8apLaTwrdtBA4W4y+bXK3lOQK +n3WHt7bnVlyn8NgRoeTiRoP4V+JX2QEQAoVzZ1FDtcaSZpFwcMa1Zc7J/BEVvXBF +VIK8haGwFVvi0PWNFxj3 +=ILhq -----END PGP SIGNATURE----- diff --git a/dev-db/mysql/mysql-5.6.26-r1.ebuild b/dev-db/mysql/mysql-5.6.26-r1.ebuild new file mode 100644 index 000000000000..f4f94a505923 --- /dev/null +++ b/dev-db/mysql/mysql-5.6.26-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26-r1.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $ + +EAPI="5" + +MY_EXTRAS_VER="20150717-1707Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" +HAS_TOOLS_PATCH="1" +SUBSLOT="18" + +inherit toolchain-funcs mysql-multilib +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +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" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +RDEPEND="${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt + +src_configure() { + # validate_password plugin uses exceptions when it shouldn't yet (until 5.7) + # disable until we see what happens with it + local mycmakeargs + mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 ) + mysql-multilib_src_configure +} + +# Official test instructions: +# USE='server embedded extraengine perl ssl static-libs community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if use server ; then + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Create a symlink to provided binaries so the tests can find them when client-libs is off + if ! use client-libs ; then + ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die + ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die + mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" + fi + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might right out of order + mkdir -p "${T}"/var-tests{,/log} + + # create symlink for the tests to find mysql_tzinfo_to_sql + ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" + + # These are failing in MySQL 5.5/5.6 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # funcs_1.is_triggers funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, + # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, + # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql + # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # rpl.rpl_plugin_load + # fails due to included file not listed in expected result + # appears to be poor planning + # + # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 + for t in \ + binlog.binlog_mysqlbinlog_filter \ + binlog.binlog_statement_insert_delayed \ + funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql \ + funcs_1.is_triggers \ + main.information_schema \ + main.mysql_client_test \ + main.mysqld--help-notwin \ + perfschema.binlog_edge_mix \ + perfschema.binlog_edge_stmt \ + rpl.rpl_plugin_load \ + main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ + ; do + mysql-multilib_disable_test "$t" "False positives in Gentoo" + done + + if ! use extraengine ; then + # bug 401673, 530766 + for t in federated.federated_plugin ; do + mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" + done + fi + + # Run mysql tests + pushd "${TESTDIR}" + + # Set file limits higher so tests run + ulimit -n 3000 + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ + --suite-timeout=5000 --reorder + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild new file mode 100644 index 000000000000..bc3d1910ae34 --- /dev/null +++ b/dev-db/mysql/mysql-5.6.26.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.26.ebuild,v 1.1 2015/07/30 04:26:27 grknight Exp $ + +EAPI="5" + +MY_EXTRAS_VER="20150410-1944Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" +SUBSLOT="18" + +inherit toolchain-funcs mysql-multilib +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +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" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +RDEPEND="${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt + +src_configure() { + # validate_password plugin uses exceptions when it shouldn't yet (until 5.7) + # disable until we see what happens with it + local mycmakeargs + mycmakeargs+=( -DWITHOUT_VALIDATE_PASSWORD=1 ) + mysql-multilib_src_configure +} + +# Official test instructions: +# USE='embedded extraengine perl ssl static-libs community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! use "minimal" ; then + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might right out of order + mkdir -p "${T}"/var-tests{,/log} + + # create symlink for the tests to find mysql_tzinfo_to_sql + ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" + + # These are failing in MySQL 5.5/5.6 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # funcs_1.is_triggers funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, + # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, + # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql + # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # rpl.rpl_plugin_load + # fails due to included file not listed in expected result + # appears to be poor planning + # + # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 + for t in \ + binlog.binlog_mysqlbinlog_filter \ + binlog.binlog_statement_insert_delayed \ + funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql \ + funcs_1.is_triggers \ + main.information_schema \ + main.mysql_client_test \ + main.mysqld--help-notwin \ + perfschema.binlog_edge_mix \ + perfschema.binlog_edge_stmt \ + rpl.rpl_plugin_load \ + main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ + ; do + mysql-multilib_disable_test "$t" "False positives in Gentoo" + done + + if ! use extraengine ; then + # bug 401673, 530766 + for t in federated.federated_plugin ; do + mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" + done + fi + + # Run mysql tests + pushd "${TESTDIR}" + + # Set file limits higher so tests run + ulimit -n 3000 + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ + --suite-timeout=5000 --reorder + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + + einfo "Skipping server tests due to minimal build." + fi +} |