commit: 9c678239e33ce47ddb131604d20852884647c711 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Fri Mar 9 18:39:24 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Fri Mar 9 18:39:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c678239
dev-db/mariadb: Fix tests and live patching Add needed items for live patch testing. The latter should not be published but it's easier to copy around Closes: https://bugs.gentoo.org/649486 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-db/mariadb/Manifest | 1 - dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 28ca147aa25..4190bd87306 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -12,5 +12,4 @@ DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a78caa633377f20dd45ce3e43516f8909f7bfa1b3ed5b115dd314540e7ea96f4232f7265d8fc50099da51934a0e38561bbeff84e4 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 -DIST mysql-extras-20180228-1611Z.tar.bz2 317225 BLAKE2B c13eefecbb5518b96390d18c1acdd5d0ee2c74d95952713d3efd047075a5164d45d4792bb4104043333278a93fddb1540443e252a82070d245972640ae7b1dd1 SHA512 cc2b940f3e7a3b988e38fdd8ae54206bf52a489d999a07e65413e042c2fc584f2901b5fca5668ed849eac3e1e70a271a0090efc463c0e99d902dff14aed0294f DIST mysql-extras-20180308-1938Z.tar.bz2 318238 BLAKE2B 003389434dc52d5e49be77d0e70edfce664d5011a6dbc280bebc1d958a6626ecf7457a720dc66a6b692e2f7796f36fc55cc7048cee78278aa1fe6f82659ccf07 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild index 8f1350fc6fa..0baa860a6a3 100644 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20180228-1611Z" +MY_EXTRAS_VER="20180308-1938Z" SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" @@ -51,6 +51,10 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86" S="${WORKDIR}/mysql" if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"; + EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras" + EGIT_CLONE_TYPE=shallow MY_PATCH_DIR="${WORKDIR}/mysql-extras" else MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" @@ -693,6 +697,12 @@ src_test() { _disable_test "$t" "False positives in Gentoo" done + if ! use client-libs ; then + _disable_test main.plugin_auth "Needs client libraries built" + fi + + _disable_test main.mysql "Bogus error text mismatch failure" + # run mysql-test tests perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" retstatus_tests=$?
