Kouhei Sutou
null+****@clear*****
Thu Nov 21 17:14:36 JST 2013
Kouhei Sutou 2013-11-21 17:14:36 +0900 (Thu, 21 Nov 2013) New Revision: a16b8c5587c4ad926943b1585f3af4f9a6edfb4d https://github.com/mroonga/mroonga/commit/a16b8c5587c4ad926943b1585f3af4f9a6edfb4d Message: travis: fix wrong MRN_BUNDLED check Modified files: tools/travis/script.sh Modified: tools/travis/script.sh (+6 -5) =================================================================== --- tools/travis/script.sh 2013-11-21 16:56:36 +0900 (17150f6) +++ tools/travis/script.sh 2013-11-21 17:14:36 +0900 (48edc85) @@ -21,11 +21,6 @@ set -e base_dir="$(cd $(dirname $0); pwd)" top_dir="${base_dir}/../.." -if [ "${MRN_BUNDLED}" != "TRUE" ]; then - n_processors=1 -else - n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" -fi bundled_mroonga_dir="${top_dir}/storage/mroonga" if [ -f "${bundled_mroonga_dir}/config.sh" ]; then @@ -36,6 +31,12 @@ else . "${top_dir}/config.sh" fi +if [ "${MRN_BUNDLED}" = "TRUE" ]; then + n_processors=1 +else + n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" +fi + build() { make -j${n_processors} > /dev/null -------------- next part -------------- HTML����������������������������...下载
