Kouhei Sutou
null+****@clear*****
Sun Sep 14 11:30:19 JST 2014
Kouhei Sutou 2014-09-14 11:30:19 +0900 (Sun, 14 Sep 2014) New Revision: 5e9e1e9dfd8f6fee19d7eaa133a218b4d3613d34 https://github.com/mroonga/mroonga/commit/5e9e1e9dfd8f6fee19d7eaa133a218b4d3613d34 Message: travis: use MROONGA_ prefix to avoid variable name conflict Modified files: .travis.yml tools/travis/before_script.sh tools/travis/install.sh tools/travis/script.sh Modified: .travis.yml (+2 -2) =================================================================== --- .travis.yml 2014-09-14 00:03:53 +0900 (7945e27) +++ .travis.yml 2014-09-14 11:30:19 +0900 (aa096ad) @@ -8,8 +8,8 @@ env: - MYSQL_VERSION=mysql-5.6.20 - MYSQL_VERSION=mariadb-5.5.39 - MYSQL_VERSION=mariadb-10.0.13 - - MYSQL_VERSION=mariadb-10.0.13 MRN_BUNDLED=yes -# - MYSQL_VERSION=mariadb-10.0.13 MRN_BUNDLED=yes MRN_TEST_EMBEDDED=yes + - MYSQL_VERSION=mariadb-10.0.13 MROONGA_BUNDLED=yes +# - MYSQL_VERSION=mariadb-10.0.13 MROONGA_BUNDLED=yes MROONGA_TEST_EMBEDDED=yes # matrix: # allow_failures: # - env: MYSQL_VERSION=mysql-system Modified: tools/travis/before_script.sh (+1 -1) =================================================================== --- tools/travis/before_script.sh 2014-09-14 00:03:53 +0900 (59a3042) +++ tools/travis/before_script.sh 2014-09-14 11:30:19 +0900 (c2dddcb) @@ -19,7 +19,7 @@ # set -x set -e -if [ "$MRN_BUNDLED" = "yes" ]; then +if [ "${MROONGA_BUNDLED}" = "yes" ]; then cmake . -DCMAKE_BUILD_TYPE=Debug else ./autogen.sh Modified: tools/travis/install.sh (+1 -1) =================================================================== --- tools/travis/install.sh 2014-09-14 00:03:53 +0900 (334a1d9) +++ tools/travis/install.sh 2014-09-14 11:30:19 +0900 (f30df49) @@ -32,7 +32,7 @@ if [ ! -f /usr/lib/groonga/plugins/tokenizers/mecab.so ]; then sudo apt-get -qq -y install groonga-tokenizer-mecab fi -if [ "${MRN_BUNDLED}" = "yes" ]; then +if [ "${MROONGA_BUNDLED}" = "yes" ]; then mkdir -p .mroonga mv * .mroonga/ mv .mroonga/tools ./ Modified: tools/travis/script.sh (+3 -3) =================================================================== --- tools/travis/script.sh 2014-09-14 00:03:53 +0900 (012985c) +++ tools/travis/script.sh 2014-09-14 11:30:19 +0900 (cc33c35) @@ -44,7 +44,7 @@ build() run_unit_test() { - if [ "${MRN_BUNDLED}" != "yes" ]; then + if [ "${MROONGA_BUNDLED}" != "yes" ]; then NO_MAKE=yes ${mroonga_dir}/test/run-unit-test.sh fi } @@ -89,11 +89,11 @@ prepare_sql_test() run_sql_test() { test_args=() - if [ "${MRN_TEST_EMBEDDED}" = "yes" ]; then + if [ "${MROONGA_TEST_EMBEDDED}" = "yes" ]; then test_args=("${test_args[@]}" "--embedded-server") fi - if [ "${MRN_BUNDLED}" = "yes" ]; then + if [ "${MROONGA_BUNDLED}" = "yes" ]; then ${mroonga_dir}/test/run-sql-test.sh "${test_args[@]}" else prepare_sql_test -------------- next part -------------- HTML����������������������������...Download
