Fix test that was not skipped for bug 531464 ; Drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 496e669ac214ccd10b8d80a3542b70c6db7478d5..65b053a8361024ed0d833317140e76e22057e143 100644 (file)
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # 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.707 2014/10/23 20:08:59 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.708 2014/12/02 18:18:11 grknight Exp $
+
+  02 Dec 2014; Brian Evans <grknight@gentoo.org> -mysql-5.6.21.ebuild,
+  mysql-5.6.21-r1.ebuild:
+  Fix test that was not skipped for bug 531464 ; Drop old
 
   23 Oct 2014; Brian Evans <grknight@gentoo.org> -mysql-5.5.39.ebuild:
   Drop old wrt security bug 525504

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e47bc678cad64a1fd4c43d3dcd7ff0b83b56d9b2..fbdb013005bea6c75d6ed06570bf26748bc017b9 100644 (file)
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -17,19 +17,18 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae
 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.6.21-r1.ebuild 4847 SHA256 9f9532aefdf71e585dda315a81e51b71a0e4a4b14c1c45ef8133d2802aec58d9 SHA512 2ee229c7a1de4a3aa1cf423001e29adc61b4378b624f254fe74e2fd9f24a9a34b9972ccc341a3935883b356dce7e1096a5aa711f7fc8aad0130b66436de19a22 WHIRLPOOL b2b2c7c650d778b5b4859fe30d755997da4df06152ad6ec3343d99541d999a15bbef355cffea846f80574b3e09345804848dfbb901f35f298918264de72f65f8
-EBUILD mysql-5.6.21.ebuild 4844 SHA256 9fdc2efb9ee4e44df4cab040c352b3a79012596a844c5ecf4c3f05bf1050f4ea SHA512 a13492621323af32962eb33196908a6e643da855eb8dd3c630607b6d91d0c84189e02c0d44bcdbd30e1bd213e4bdbb0f02ef8a659d9fbdbab2d8419ebcb97ef2 WHIRLPOOL d74968b35af00c2f9fec80ca617004b4b27fb981c727d8e6b5051857657676504a74b03ac7c21f12c01656b31671f756ed847be467aa2499de5170ce6c4de4c1
-MISC ChangeLog 21894 SHA256 8dbdabe5e2e239dd778387d7ff28a6bc2695ddc5c3a4ce07494b51e29dc922ee SHA512 f0a42bcb469484a815727aaa8f9508393dabef681efad302dc72bb16d3c4363befc924cadbc43167fb61b5bce0c20818812aa2feecb2f17ef72b1090f2d09445 WHIRLPOOL 202fe6d635312631f688c63e497883e86e31c78875fa637478e032bc382bfdd6b5081b4c99e011fe7b24359c641fd4d7130296e7f0197f511bd4b69736cc343a
+EBUILD mysql-5.6.21-r1.ebuild 4828 SHA256 8fe5739aa873d1bd6475bfbfd5cd036e9509ea96c373667df351ec0021f82ef6 SHA512 c3ad6f344ba695535257b4da711ddada022490eb0ebe717ccdae4e23fbf27211a65745cb0db9df60bd103bbde7e8089f5ccd0b63ffd73c1d12c66ec10f2e28e5 WHIRLPOOL 5e682fdf50352614fdadf015a3618bcf679e30a530b449e53ff691d16efd3ae4508fe1244f25c91a13e3ea0eae90ad44f16e66c78e550a988c95d4c04d1a126f
+MISC ChangeLog 22050 SHA256 0c21af5ee48dff9d2d8fd24a29979ab6c27a1eb735146527c93e557fc6423959 SHA512 3cc2d91965576c4e02b37cc9bf3d22ace753838f34981f3123519335a7d2f75e09d866d2a5fbd4dd5062654db636f0c5e2b17b1c85c16419943b708e2f65ce8f WHIRLPOOL c29f805d5c5dba193502cd3142a2f6a1718052a9bc2ffcf977a5af5b3328fac31956eaa9accf4fd82e9e1a67a4510d5d1879359ed1c57fdb81698704fffbce24
 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
 
-iQEcBAEBCAAGBQJUSWBhAAoJEE4V4vFnx44dZ5kH+gJMSynxRJwmC+qJR7uAJwXQ
-Jp4ZwOvKnd84doQlBL9bbNKFl8964I27O7GmmQ+v0LUPh6T2VclB0YgaKU9MY4Us
-urg97PjL0OjyJykB1TN8PIWRIsg7dIT+EoX54y5UNfo0aZEJw8zMgq2lUs2GjNa+
-tLVyH5Dg0DPYArRjb5DMiFEzLkirD92lM0ZC8mxtkgcU0uCeMaCBhv/jLvH3ioht
-bUYZWBWIViLXc8O4ZbQniXh5GrPDjp5J2pxwiWj5fKrZqoOEY1EZW/SV+sljpWGs
-w08K2oJUk/1sQ+vHQL19A40FYmwoRreD2UBxS10fNStZoo01wWXGxhkwAGR7b/s=
-=Ls3s
+iQEcBAEBCAAGBQJUfgJqAAoJEE4V4vFnx44didIH+wdaX8r6aoEKmEMIGqHlId3N
+f33WwZNqTH5yLalI1tacGtSAqHAdc5DK9a1DqrG4WCvLaV6LiMA8uwOtOuRdhhvY
+xkh+9nyAXZu863ONzXDwtrZMb8P5CfTA6B5hhfCNU9AeNxNVdXhjojQrqGB1to2x
+5gIyj4rokhhR2MrjuTAplaozOaFiMjA8IF27hwE4EXKNbORIQlGKHOeKmeVnNi8z
+ErB8LldbpDIH30iK0x/I7yJeqncjNIdENrwboe6dxfMA/T9F9/lF6DQNAQwIqUff
+4Vpnh0in4ul0PEIp5h7heEz8frSg8KASIv2yRr78DTyyF8TRJWDEg3ZMl41hUkE=
+=5fRm
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.6.21-r1.ebuild b/dev-db/mysql/mysql-5.6.21-r1.ebuild
index 6cfa93366114057123a11b8f505a0dc44650a0e3..8b10fb117af4bf3f8980d7ba80222c876d539f0c 100644 (file)
--- a/dev-db/mysql/mysql-5.6.21-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.21-r1.ebuild,v 1.1 2014/10/19 20:27:12 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21-r1.ebuild,v 1.2 2014/12/02 18:18:11 grknight Exp $
 
 EAPI="5"
 
@@ -98,7 +98,7 @@ multilib_src_test() {
                        funcs_1.is_triggers \
                        main.information_schema \
                        main.mysql_client_test \
-                       main.mysqld--help-notwinfuncs_1.is_triggers \
+                       main.mysqld--help-notwin \
                        perfschema.binlog_edge_mix \
                        perfschema.binlog_edge_stmt \
                        rpl.rpl_plugin_load \

diff --git a/dev-db/mysql/mysql-5.6.21.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild
deleted file mode 100644 (file)
index 6e20559..0000000
--- a/dev-db/mysql/mysql-5.6.21.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.21.ebuild,v 1.4 2014/10/15 16:46:57 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20140801-1950Z"
-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="${CMAKE_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 "${CMAKE_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-notwinfuncs_1.is_triggers \
-                       perfschema.binlog_edge_mix \
-                       perfschema.binlog_edge_stmt \
-                       rpl.rpl_plugin_load \
-               ; do
-                               mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-               done
-
-               # 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
-}