Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@×××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Fri, 24 Jan 2014 13:48:01
Message-Id: 1390571268.24309f896d292a065184840d7af621c12cc14447.grknight.pub@gentoo
1 commit: 24309f896d292a065184840d7af621c12cc14447
2 Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
3 AuthorDate: Fri Jan 24 13:47:48 2014 +0000
4 Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
5 CommitDate: Fri Jan 24 13:47:48 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=24309f89
7
8 [mysql] Increase suite timeout and open files for tests
9
10 ---
11 dev-db/mysql/mysql-5.6.15.ebuild | 6 +++++-
12 dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 6 +++++-
13 2 files changed, 10 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-db/mysql/mysql-5.6.15.ebuild b/dev-db/mysql/mysql-5.6.15.ebuild
16 index 0a0607d..d23c26a 100644
17 --- a/dev-db/mysql/mysql-5.6.15.ebuild
18 +++ b/dev-db/mysql/mysql-5.6.15.ebuild
19 @@ -98,8 +98,12 @@ src_test() {
20 # Run mysql tests
21 pushd "${TESTDIR}"
22
23 + # Set file limits higher so tests run
24 + ulimit -n 3000
25 +
26 # run mysql-test tests
27 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
28 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
29 + --suite-timeout=5000
30 retstatus_tests=$?
31 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
32 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
33
34 diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
35 index 7f2d236..9277e7a 100644
36 --- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
37 +++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
38 @@ -98,8 +98,12 @@ src_test() {
39 # Run mysql tests
40 pushd "${TESTDIR}"
41
42 + # Set file limits higher so tests run
43 + ulimit -n 3000
44 +
45 # run mysql-test tests
46 - perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
47 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
48 + --suite-timeout=5000
49 retstatus_tests=$?
50 [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
51 has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"