commit:     93af0ab20dcb82150258466510cacdeafaa82562
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 18:47:02 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 18:47:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=93af0ab2

dev-db/mariadb: Drop old, vulnerable 10.1 series beta releases

Package-Manager: portage-2.2.23
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb/ChangeLog                  |   4 +
 dev-db/mariadb/Manifest                   |  31 ++++----
 dev-db/mariadb/mariadb-10.1.6_beta.ebuild | 121 ----------------------------
 dev-db/mariadb/mariadb-10.1.7_rc.ebuild   | 127 ------------------------------
 4 files changed, 18 insertions(+), 265 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index e0d8105..32fe707 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  29 Oct 2015; Brian Evans <grkni...@gentoo.org> -mariadb-10.1.6_beta.ebuild,
+  -mariadb-10.1.7_rc.ebuild:
+  dev-db/mariadb: Drop old, vulnerable 10.1 series beta releases
+
 *mariadb-10.0.22-r1 (29 Oct 2015)
 *mariadb-10.0.22 (29 Oct 2015)
 

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2c4e7b1..423d07c 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,8 +3,6 @@ Hash: SHA256
 
 DIST mariadb-10.0.19.tar.gz 56224123 SHA256 
2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 
bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3
 WHIRLPOOL 
d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
 DIST mariadb-10.0.22.tar.gz 56252325 SHA256 
9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 
68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d
 WHIRLPOOL 
84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
-DIST mariadb-10.1.6.tar.gz 53777046 SHA256 
492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959 SHA512 
756dc18de6cada952e41b994afeda0cd952d851929c99cae5476111915e6678fa4899ef9950857413eb8b6ce113070b5d2171a2c01d29b27195b1e2515dc13eb
 WHIRLPOOL 
23630af399cd96e5c0d937a2cae31db76a6773026f189be6856fc30179c7649d265ef8bddd2ea8ee0d10f31deee725074af774879b8e33fa6688cab92a2bb1c0
-DIST mariadb-10.1.7.tar.gz 53812743 SHA256 
5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 
4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a
 WHIRLPOOL 
2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
 DIST mariadb-10.1.8.tar.gz 53920483 SHA256 
7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 
6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45
 WHIRLPOOL 
65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
 WHIRLPOOL 
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
 WHIRLPOOL 
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
@@ -14,24 +12,23 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 
ea5da082d3384bde67e005eb
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
 WHIRLPOOL 
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 
de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 
f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4
 WHIRLPOOL 
f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
 WHIRLPOOL 
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20150914-1946Z.tar.bz2 1491203 SHA256 
4bc3842c74ae48297e8eaef71f76461dad2ed5f804c1811ab289643088f1d48e SHA512 
75d57703d43a25b74a8c72a08eb9f582b470d3108532dd3fecbdc4a928e1e7ce99f8c02fb667b069a6f036a5e528e67a86e8508a4916b0b20bc3193d5a9f1212
 WHIRLPOOL 
588366aeaa50da09134d9c0eefe8922b8cde5514373d1e25f2c311ed7a023f792cb1dc69e4cd61e9732d051f26c2ce5bf90991502f6135e7578b36f64f23590d
 DIST mysql-extras-20151019-1714Z.tar.bz2 1490296 SHA256 
f27297292f91c698b1ab7118740728c05a3ebfcd0bfad575898d112faaef4f4b SHA512 
00db9c76847a0f58915890e34a9487c147d25fba7b33db3aa1037e8f5d6afb32448b5eae7a5583c52c03b53693b792e077dc963b7dc84356d382ba46bebc8777
 WHIRLPOOL 
a0912ad0ecde9044761312586edb2899b58663517a8d8bab3f2c59938282bb472bdb97ed25ce097f9b18c1ad35a185494f8ad2e630c2004b717f1b61573335ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJWMmkpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWMmmlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2BEEP/1EGwmahYjqK7NW9OGPyQtdT
-9DMm5y1MRubtGmrnQh5sbKH4sWQ2vu6N8J9DG41pxDkcWhyssGqOnTnyIh4Q7fsN
-w7qs9hi1I3sN8ZjY4c/ftf5F2xeqi5SxsQ/HgYT4mlPafSiI/IEyWWKZuaOkOs9B
-FVRLdlTBcOzcK8QvhxoidVbA6+tA72eTyFTOnz3UuAKxGu6muScFpIiTUk2/nscJ
-Z+Jn6dgibpxFe2ae2q/EXJOe+2g9kzHNLYfJudNwT757O4+bx4Tp3hqd9NUA1IHJ
-wJAQmDCFunVTiCdzdY0/LSIWzXx4+vCOhnukvbyR/I5Gd5igctL/dK6m3dl6fUtw
-2kILv996fMXvV+rMlr7irfKIIFf6Q9IUFWnVwlGpZbBXUAKWf306tROnjBa8o6qe
-l8+y7KQzyanVNnWbe0ECDdt4GjshXa4dWosr11SErVro+J5yf7J1GERVvwtI8Tfv
-7t34JpMak5HZFQabWpDYtZcS2oeMjNeLSQYfiZnlGM2fVDp5cIOj0u5T+tTKXpo+
-T4yzsKxun8IcX3IncB750i2lz8S+F0eRlWD27mGUm7pCVoBZS6cGzh+Sl8QMO3Y5
-0YJnY+QyLpRs53RfX1v+rei+zetVx7RMF7P832PNADwuMws3P4xNUdyrsQH2etzx
-VrDecE6Rjr7eeJpDGPXT
-=APX5
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2RJEQAIGO63ovUeNECFCSnv4EiPXX
+kZE4C1H9I6mxE2Ig9VCi/b2vINoGesGuGQgO/CTq7oP63itkkchehSoZJ4O2hw6v
+eivRQlFqDgJ5DzywefnFtaWXlKu33nRiyzT11FeWMvb1htHN1y9GSnHU2KoyeMqC
+ZYAdGWJfuWduQa8JBVR973/RK1HbtEufd79y5a+CZZvEeeRXzKu6s9xZxXZUmJGG
+SEgBcPp7u8c+A+SWkoaY4Fta4kv47wMnIIGGmV0JuNU508rzySmCnEzC7Zfq+fKi
+rbcbmcje4T85YQLKGSATGB1znUIpw187+EuY1+V/1pXyp4mK4EbcX1DdOub71zMq
+X6ZaqZZsok1S+6HsN5aXmkIA8r1/U6qbkP9z7zvkC9pf9R5Zdg+sJRnawwMhFBBu
+ex7e24aj7qnfZwYhC2aSTE4CuqRWpt5OVioAEUKqbcjAh9AaSbbHs/hgRrbLHuXs
+jpRqc4CWe/ZABeQhkProhI4DSlOCLDFvefDSFnpiWhKVNZ+jgOnJJ2dnmvSgz4UX
+roJEBIfi7xn8/smoPUw4S3F035L8JpHde8yZQsAsUs5mf3YiT2bFpD/MKMEWv2EX
+jKPGEmTy69mbfIf/5OrsHvgDX79sL76yO9D6NbWihxMqrgmBoHgF/wEId/KojFEm
+Aban1Iu2jPY2rLyAGayA
+=s7Eq
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb/mariadb-10.1.6_beta.ebuild 
b/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
deleted file mode 100644
index 4678099..0000000
--- a/dev-db/mariadb/mariadb-10.1.6_beta.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="live"
-WSREP_REVISION="25"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-       mroonga? ( app-text/groonga-normalizer-mysql )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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}
-
-               # These are failing in MariaDB 10.0 for now and are believed to 
be
-               # false positives:
-               #
-               # main.information_schema, 
binlog.binlog_statement_insert_delayed,
-               # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
-               # funcs_1.is_columns_mysql main.bootstrap
-               # fails due to USE=-latin1 / utf8 default
-               #
-               # main.mysql_client_test, main.mysql_client_test_nonblock
-               # main.mysql_client_test_comp:
-               # segfaults at random under Portage only, suspect resource 
limits.
-               #
-               # plugins.cracklib_password_check
-               # Can randomly fail due to cracklib return message
-
-#                      main.bootstrap \
-               for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
-                       main.mysql_client_test_comp \
-                       binlog.binlog_statement_insert_delayed 
main.information_schema \
-                       main.mysqld--help plugins.cracklib_password_check \
-                       funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
-                               mysql-multilib_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"
-
-               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/mariadb/mariadb-10.1.7_rc.ebuild 
b/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
deleted file mode 100644
index a28f854..0000000
--- a/dev-db/mariadb/mariadb-10.1.7_rc.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150914-1946Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~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='20014_all_mariadb-innodb-compression.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-       mroonga? ( app-text/groonga-normalizer-mysql )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs embedded extraengine perl server openssl static-libs tools' 
\
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-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
-
-       if use server ; then
-
-               # 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 [[ $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 run out of order
-               mkdir -p "${T}"/var-tests{,/log}
-
-               # These are failing in MariaDB 10.0 for now and are believed to 
be
-               # false positives:
-               #
-               # main.information_schema, 
binlog.binlog_statement_insert_delayed,
-               # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
-               # funcs_1.is_columns_mysql main.bootstrap
-               # fails due to USE=-latin1 / utf8 default
-               #
-               # main.mysql_client_test, main.mysql_client_test_nonblock
-               # main.mysql_client_test_comp:
-               # segfaults at random under Portage only, suspect resource 
limits.
-               #
-               # plugins.cracklib_password_check
-               # Can randomly fail due to cracklib return message
-
-               for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
-                       main.mysql_client_test_comp main.bootstrap \
-                       binlog.binlog_statement_insert_delayed 
main.information_schema \
-                       main.mysqld--help plugins.cracklib_password_check \
-                       funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
-                               mysql-multilib_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" 
--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
-}

Reply via email to