From 93b90222133c4a4dc97a3bde16853839bcafdb87 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Thu, 4 Dec 2014 01:27:53 +0000 Subject: [PATCH] Version bumps for 5.5 and 5.6 series Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x67C78E1D --- dev-db/mysql/ChangeLog | 9 +- dev-db/mysql/Manifest | 21 +++-- dev-db/mysql/mysql-5.5.41.ebuild | 121 +++++++++++++++++++++++++ dev-db/mysql/mysql-5.6.22.ebuild | 147 +++++++++++++++++++++++++++++++ 4 files changed, 289 insertions(+), 9 deletions(-) create mode 100644 dev-db/mysql/mysql-5.5.41.ebuild create mode 100644 dev-db/mysql/mysql-5.6.22.ebuild diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 65b053a83610..374bb180bf74 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.708 2014/12/02 18:18:11 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.709 2014/12/04 01:27:44 grknight Exp $ + +*mysql-5.5.41 (04 Dec 2014) +*mysql-5.6.22 (04 Dec 2014) + + 04 Dec 2014; Brian Evans +mysql-5.5.41.ebuild, + +mysql-5.6.22.ebuild: + Version bumps for 5.5 and 5.6 series 02 Dec 2014; Brian Evans -mysql-5.6.21.ebuild, mysql-5.6.21-r1.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index fbdb013005be..f3967c10ed1a 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -7,28 +7,33 @@ AUX my.cnf-5.6 4674 SHA256 c7eb9b67e6dc0006dc10bc3b0a4ade611fc1d05e50c7469d5e1d1 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942 DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43 +DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31 +DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87 DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256 9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512 c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799 WHIRLPOOL bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86 +DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736 EBUILD mysql-5.5.40.ebuild 4073 SHA256 b995be1a0cf508a87e12225ae6168f91a0f4098ce24aa4d61e00f4ae1d735519 SHA512 4c6eb3f253a0769421d1c0f4c88081251c7f0159f7d58a60ce9a7f4132405ab897f8dfbdb19ae4584c87df955d109abc17f884cc97a674dcb835f01b181f9841 WHIRLPOOL 8420b841f89f25eac7cf4300de2918e1372ca76f40e55acbee3a55f0a1bc367cd1b946767033ddd97803ff33ddf6db4055b85d1e347b9dcccda070bfd6f95193 +EBUILD mysql-5.5.41.ebuild 4071 SHA256 ae8165b249af56c676522c5fecdb259108e08fde3bee78da082d3d965c66429a SHA512 e2603665081ce6afc48aa192a50f0c318069ab8f90ab0e90b807e7ae29c1fcfb0d852a01bc4da2f77c01308fb18bdb632bbfcf950962749c36a021be2c862b6c WHIRLPOOL cee7a7f8ced60c89c68b91a2c7b1700d22f8fbb3ee7f7f737bde34f9758c56e0cc4ad1f28db6985381a2468df96f229b2d228aeadadfa9ef8bb09546034ea6d8 EBUILD mysql-5.6.21-r1.ebuild 4828 SHA256 8fe5739aa873d1bd6475bfbfd5cd036e9509ea96c373667df351ec0021f82ef6 SHA512 c3ad6f344ba695535257b4da711ddada022490eb0ebe717ccdae4e23fbf27211a65745cb0db9df60bd103bbde7e8089f5ccd0b63ffd73c1d12c66ec10f2e28e5 WHIRLPOOL 5e682fdf50352614fdadf015a3618bcf679e30a530b449e53ff691d16efd3ae4508fe1244f25c91a13e3ea0eae90ad44f16e66c78e550a988c95d4c04d1a126f -MISC ChangeLog 22050 SHA256 0c21af5ee48dff9d2d8fd24a29979ab6c27a1eb735146527c93e557fc6423959 SHA512 3cc2d91965576c4e02b37cc9bf3d22ace753838f34981f3123519335a7d2f75e09d866d2a5fbd4dd5062654db636f0c5e2b17b1c85c16419943b708e2f65ce8f WHIRLPOOL c29f805d5c5dba193502cd3142a2f6a1718052a9bc2ffcf977a5af5b3328fac31956eaa9accf4fd82e9e1a67a4510d5d1879359ed1c57fdb81698704fffbce24 +EBUILD mysql-5.6.22.ebuild 5022 SHA256 60d68978838691c6225eeab88be9f76b111e6fa73008d7903d9ee61e30d1add0 SHA512 981e92d79b9fedc2c6292c90d59ce72015ccc12f6871afd469c73fe8537fa5c288920e65395aebfc820387c50eaab38d7d2483d0d7cce106f8341c87f1302cd8 WHIRLPOOL bbb2f8b036f3624855e2c6519c7387d720fe605fbeb6134d8dafff10598ff1279a35235d438d9c69909b9f195e56f4361e035463922a1d9a8adf3bbe5124856a +MISC ChangeLog 22242 SHA256 164f87f7c172df7f2cf5584bf2585603219af18bfe7ba1ca184587ebf7b688a0 SHA512 12836035d0278143e096073271455ec9fc6f2253bb81e0bce817f36471a2c3ac948444f2cbfa82bb67a5b8df2d0d285b656201f1071c435fdd1348f537516c2c WHIRLPOOL 4ce1413e27c9bcdd25be47c1367cfe36260e7499daaddf663b1d64672418db4c1e684c63104b7457300a2b86eee01044707a71761478b8ad06c0b731c8b728ae MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUfgJqAAoJEE4V4vFnx44didIH+wdaX8r6aoEKmEMIGqHlId3N -f33WwZNqTH5yLalI1tacGtSAqHAdc5DK9a1DqrG4WCvLaV6LiMA8uwOtOuRdhhvY -xkh+9nyAXZu863ONzXDwtrZMb8P5CfTA6B5hhfCNU9AeNxNVdXhjojQrqGB1to2x -5gIyj4rokhhR2MrjuTAplaozOaFiMjA8IF27hwE4EXKNbORIQlGKHOeKmeVnNi8z -ErB8LldbpDIH30iK0x/I7yJeqncjNIdENrwboe6dxfMA/T9F9/lF6DQNAQwIqUff -4Vpnh0in4ul0PEIp5h7heEz8frSg8KASIv2yRr78DTyyF8TRJWDEg3ZMl41hUkE= -=5fRm +iQEcBAEBCAAGBQJUf7iVAAoJEE4V4vFnx44dOhAH/RyuTVau34LWkdIEdfvKLVO5 +5sCuLzsBRggj44IRN6gIZs5YxVsSpUspyA8YZbpwWed9aJKPTD9P6se54mO2M8fk +PVElu5J5exvhTu7V3PfrxWf5nKXTd+bwtFlEC0yw18XXALEON8prk/5a4CeEDgrZ +i4z/uTD7OdXCJgSwY8U16es/YgCQBpof+6l2SVarFk9QE154yAAlxyCLMfSWIbVU +1Bbb0uDjDMYnK1Qz9waSKwBWqDU/RP0fdx8Jh9ELPFkLKozHm4ThJyeq2HjeEcm5 +hRCDJ3A2S7pE9XbmXO4pRM0Pt7hwJUkdKVTa/WR0oXa1aeefc6v02qoX5zYVkzQ= +=R9JI -----END PGP SIGNATURE----- diff --git a/dev-db/mysql/mysql-5.5.41.ebuild b/dev-db/mysql/mysql-5.5.41.ebuild new file mode 100644 index 000000000000..8cd099618c47 --- /dev/null +++ b/dev-db/mysql/mysql-5.5.41.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.41.ebuild,v 1.1 2014/12/04 01:27:44 grknight Exp $ + +EAPI="5" + +MY_EXTRAS_VER="20141203-2105Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" + +# Build type +BUILD="cmake" + +inherit toolchain-funcs mysql-v2 +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# Define the mysql-extras source +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" + +# 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 + +# Official test instructions: +# USE='-cluster embedded extraengine perl ssl static-libs community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + + 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 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help-notwin + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + + for t in main.mysql_client_test \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help-notwin ; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ + --testcase-timeout=30 + 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.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild new file mode 100644 index 000000000000..515f0c1125a4 --- /dev/null +++ b/dev-db/mysql/mysql-5.6.22.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.1 2014/12/04 01:27:44 grknight Exp $ + +EAPI="5" + +MY_EXTRAS_VER="20141203-2105Z" +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" + +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 + +# Official test instructions: +# USE='-cluster 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 + 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 \ + ; 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 + 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 +} -- 2.26.2