diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2017-06-08 13:41:50 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-06-08 10:51:52 +0400 |
| commit | 035f74c36c40728323bc94909cc2ec294bb34373 (patch) | |
| tree | 47135e6575a908bec51848c528a782d6bdde46a5 | |
| parent | bb1f41423a0c26313a7bd4b7704ccc4ad66e348a (diff) | |
| download | mariadb-git-035f74c36c40728323bc94909cc2ec294bb34373.tar.gz | |
travis: enable (main,archive).mysqlhotcopy_\1 test
| -rwxr-xr-x | .travis.compiler.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 35e79e177ef..6058d95a170 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -39,8 +39,4 @@ else fi fi -# main.mysqlhotcopy_myisam consitently failed in travis containers -# https://travis-ci.org/grooverdan/mariadb-server/builds/217661580 -echo 'main.mysqlhotcopy_myisam : unstable in containers' >> ${TRAVIS_BUILD_DIR}/mysql-test/unstable-tests -echo 'archive.mysqlhotcopy_archive : unstable in containers' >> ${TRAVIS_BUILD_DIR}/mysql-test/unstable-tests set +v +x diff --git a/.travis.yml b/.travis.yml index 53c4e06eddd..9745b8c33e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,6 @@ matrix: compiler: gcc script: - ${CC} --version ; ${CXX} --version - # Just for disabling hotcopy tests for now - source .travis.compiler.sh # https://github.com/travis-ci/travis-ci/issues/7062 - /run/shm isn't writable or executable # in trusty containers @@ -108,6 +107,7 @@ addons: - libaio-dev - libboost-dev - libcurl3-dev + - libdbd-mysql - libjudy-dev - libncurses5-dev - libpam0g-dev |