robbat2     14/07/29 23:10:04

  Modified:             ChangeLog
  Added:                mariadb-10.0.12.ebuild
  Log:
  Bring MySQL 5.6/MariaDB 10.0 from the overlay into the tree. Thanks to the 
great work of Brian Evans <[email protected]>. ~arm temporarily dropped 
pending bug #518506.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.41                 dev-db/mariadb/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.41&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.41&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?r1=1.40&r2=1.41

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -p -w -b -B -u -u -r1.40 -r1.41
--- ChangeLog   29 Jul 2014 03:28:26 -0000      1.40
+++ ChangeLog   29 Jul 2014 23:10:04 -0000      1.41
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.40 2014/07/29 
03:28:26 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.41 2014/07/29 
23:10:04 robbat2 Exp $
+
+*mariadb-10.0.12 (29 Jul 2014)
+
+  29 Jul 2014; Robin H. Johnson <[email protected]> +mariadb-10.0.12.ebuild:
+  Bring MySQL 5.6/MariaDB 10.0 from the overlay into the tree. Thanks to the
+  great work of Brian Evans <[email protected]>. ~arm temporarily dropped
+  pending bug #518506.
 
 *mariadb-5.5.38-r1 (29 Jul 2014)
 



1.1                  dev-db/mariadb/mariadb-10.0.12.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild?rev=1.1&content-type=text/plain

Index: mariadb-10.0.12.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild,v 1.1 
2014/07/29 23:10:04 robbat2 Exp $

EAPI="5"
MY_EXTRAS_VER="20140729-2200Z"

# Build system
BUILD="cmake"

inherit toolchain-funcs mysql-v2
# 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 ~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}"

# Official test instructions:
# USE='-cluster embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-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))"

                # create directories because mysqladmin might right out of order
                mkdir -p "${S}"/mysql-test/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
                # fails due to USE=-latin1 / utf8 default
                #
                # main.mysql_client_test, main.mysql_client_test_nonblock:
                # segfaults at random under Portage only, suspect resource 
limits.
                #
                # plugins.unix_socket
                # fails because portage strips out the USER enviornment variable
                #

                for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
                        binlog.binlog_statement_insert_delayed 
main.information_schema \
                        main.mysqld--help plugins.unix_socket \
                        funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
                                mysql-v2_disable_test  "$t" "False positives in 
Gentoo"
                done

                # Run mysql tests
                pushd "${TESTDIR}"

                # run mysql-test tests
                # Skip all CONNECT engine tests until upstream respondes to how 
to reference data files
                perl mysql-test-run.pl --force 
--vardir="${S}/mysql-test/var-tests" \
                        --skip-test=connect --parallel=auto
                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