Kouhei Sutou
null+****@clear*****
Sun Sep 14 15:10:03 JST 2014
Kouhei Sutou 2014-09-14 15:10:03 +0900 (Sun, 14 Sep 2014) New Revision: aeb6f4bfeab03175856037f4c67437986c06ed0b https://github.com/mroonga/mroonga/commit/aeb6f4bfeab03175856037f4c67437986c06ed0b Message: travis: disable only parallel build Modified files: tools/travis/script.sh Modified: tools/travis/script.sh (+12 -10) =================================================================== --- tools/travis/script.sh 2014-09-14 12:56:18 +0900 (849151e) +++ tools/travis/script.sh 2014-09-14 15:10:03 +0900 (632a4db) @@ -31,19 +31,19 @@ else . "${top_dir}/config.sh" fi -if [ "${MROONGA_BUNDLED}" = "yes" ]; then - n_processors=1 -else - n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" - max_n_processors=8 - if (( $n_processors > $max_n_processors )); then - n_processors=$max_n_processors - fi +n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)" +max_n_processors=8 +if (( $n_processors > $max_n_processors )); then + n_processors=$max_n_processors fi build() { - make -j${n_processors} > /dev/null + if [ "${MROONGA_BUNDLED}" = "yes" ]; then + make > /dev/null + else + make -j${n_processors} > /dev/null + fi } run_unit_test() @@ -98,7 +98,9 @@ run_sql_test() fi if [ "${MROONGA_BUNDLED}" = "yes" ]; then - ${mroonga_dir}/test/run-sql-test.sh "${test_args[@]}" + ${mroonga_dir}/test/run-sql-test.sh \ + "${test_args[@]}" \ + --parallel="${n_processors}" else prepare_sql_test -------------- next part -------------- HTML����������������������������...ダウンロード
