Attachment #386074 for bug #524158

View | Details | Raw Unified | Return to bug 524158
Collapse All | Expand All




		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:

		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"


		[[ -z "$failures" ]] || die "Test failures: $failures"
		einfo "Tests successfully completed"

		# Cleanup data files after tests
		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
	else

		einfo "Skipping server tests due to minimal build."




		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"

		# 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/"

		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"


		[[ -z "$failures" ]] || die "Test failures: $failures"
		einfo "Tests successfully completed"

		# Cleanup data files after tests
		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
	else

		einfo "Skipping server tests due to minimal build."

Return to bug 524158

Lines 61-67 multilib_src_test() { Link Here

(-)mariadb-10.0.14.ebuild (-5 / +2 lines)
61	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"	61	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
62		62
63	# create directories because mysqladmin might right out of order	63	# create directories because mysqladmin might right out of order
64	mkdir -p "${S}"/mysql-test/var-tests{,/log}	64	mkdir -p "${T}"/var-tests{,/log}
65		65
66	# These are failing in MariaDB 10.0 for now and are believed to be	66	# These are failing in MariaDB 10.0 for now and are believed to be
67	# false positives:	67	# false positives:
Lines 88-94 multilib_src_test() { Link Here
88	pushd "${TESTDIR}"	88	pushd "${TESTDIR}"
89		89
90	# run mysql-test tests	90	# run mysql-test tests
91	perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"	91	perl mysql-test-run.pl --force --vardir="${T}/var-tests"
92		92
93	retstatus_tests=$?	93	retstatus_tests=$?
94	[[ $retstatus_tests -eq 0 ]] \|\| eerror "tests failed"	94	[[ $retstatus_tests -eq 0 ]] \|\| eerror "tests failed"
Lines 107-115 multilib_src_test() { Link Here
107		107
108	[[ -z "$failures" ]] \|\| die "Test failures: $failures"	108	[[ -z "$failures" ]] \|\| die "Test failures: $failures"
109	einfo "Tests successfully completed"	109	einfo "Tests successfully completed"
110
111	# Cleanup data files after tests
112	rm -r "${S}/mysql-test/var-tests" \|\| die "Cleanup failed"
113	else	110	else
114		111
115	einfo "Skipping server tests due to minimal build."	112	einfo "Skipping server tests due to minimal build."

Lines 59-65 src_test() { Link Here

(-)mariadb-5.5.39.ebuild (-5 / +2 lines)
59	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"	59	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
60		60
61	# create directories because mysqladmin might right out of order	61	# create directories because mysqladmin might right out of order
62	mkdir -p "${S}"/mysql-test/var-tests{,/log}	62	mkdir -p "${T}"/var-tests{,/log}
63		63
64	# create symlink for the tests to find mysql_tzinfo_to_sql	64	# create symlink for the tests to find mysql_tzinfo_to_sql
65	ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"	65	ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
Lines 87-93 src_test() { Link Here
87	pushd "${TESTDIR}"	87	pushd "${TESTDIR}"
88		88
89	# run mysql-test tests	89	# run mysql-test tests
90	perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \	90	perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
91	--testcase-timeout=30	91	--testcase-timeout=30
92	retstatus_tests=$?	92	retstatus_tests=$?
93	[[ $retstatus_tests -eq 0 ]] \|\| eerror "tests failed"	93	[[ $retstatus_tests -eq 0 ]] \|\| eerror "tests failed"
Lines 106-114 src_test() { Link Here
106		106
107	[[ -z "$failures" ]] \|\| die "Test failures: $failures"	107	[[ -z "$failures" ]] \|\| die "Test failures: $failures"
108	einfo "Tests successfully completed"	108	einfo "Tests successfully completed"
109
110	# Cleanup data files after tests
111	rm -r "${S}/mysql-test/var-tests" \|\| die "Cleanup failed"
112	else	109	else
113		110
114	einfo "Skipping server tests due to minimal build."	111	einfo "Skipping server tests due to minimal build."