Kouhei Sutou
null+****@clear*****
Wed Mar 27 10:03:15 JST 2013
Kouhei Sutou 2013-03-27 10:03:15 +0900 (Wed, 27 Mar 2013) New Revision: 145f9180294f4a6aff704544eebde5607b8c657a https://github.com/mroonga/mroonga/commit/145f9180294f4a6aff704544eebde5607b8c657a Message: travis: define mroonga's base directory for bundled and not bundled Modified files: tools/travis/script.sh Modified: tools/travis/script.sh (+9 -9) =================================================================== --- tools/travis/script.sh 2013-03-27 09:52:56 +0900 (8283e8e) +++ tools/travis/script.sh 2013-03-27 10:03:15 +0900 (05105a9) @@ -20,9 +20,13 @@ set -e base_dir="$(cd $(dirname $0); pwd)" -top_dir="$base_dir/../.." +if [ "${MRN_BUNDLED}" = "yes" ]; then + mroonga_dir="$base_dir/../../storage/mroonga" +else + mroonga_dir="$base_dir/../.." +fi n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" -. "${top_dir}/config.sh" +. "${mroonga_dir}/config.sh" build() { @@ -31,11 +35,7 @@ build() run_unit_test() { - if [ "${MRN_BUNDLED}" = "yes" ]; then - NO_MAKE=yes storage/mroonga/test/run-unit-test.sh - else - NO_MAKE=yes test/run-unit-test.sh - fi + NO_MAKE=yes ${mroonga_dir}/test/run-unit-test.sh } prepare_mysql_test_dir() @@ -50,8 +50,8 @@ prepare_mysql_test_dir() fi sudo chown -R $(id -u):$(id -g) ${mysql_test_dir}/ - cp -a ${top_dir}/test/sql/include/*.inc ${mysql_test_dir}/include/ - cp -a ${top_dir}/test/sql/suite/mroonga/ ${mysql_test_dir}/suite/ + cp -a ${mroonga_dir}/test/sql/include/*.inc ${mysql_test_dir}/include/ + cp -a ${mroonga_dir}/test/sql/suite/mroonga/ ${mysql_test_dir}/suite/ } collect_test_suite_names() -------------- next part -------------- HTML����������������������������...下載
