Kouhei Sutou
null+****@clear*****
Sun Sep 14 00:03:53 JST 2014
Kouhei Sutou 2014-09-14 00:03:53 +0900 (Sun, 14 Sep 2014) New Revision: 28526a46eeb24d65c0f86b31a2dcdcf316b11aa2 https://github.com/mroonga/mroonga/commit/28526a46eeb24d65c0f86b31a2dcdcf316b11aa2 Message: travis: debug Modified files: tools/travis/script.sh Modified: tools/travis/script.sh (+15 -11) =================================================================== --- tools/travis/script.sh 2014-09-14 00:03:37 +0900 (5f60028) +++ tools/travis/script.sh 2014-09-14 00:03:53 +0900 (012985c) @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright(C) 2012-2013 Kouhei Sutou <kou �� clear-code.com> +# Copyright(C) 2012-2014 Kouhei Sutou <kou �� clear-code.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# set -x +set -x set -e base_dir="$(cd $(dirname $0); pwd)" @@ -93,16 +93,20 @@ run_sql_test() test_args=("${test_args[@]}" "--embedded-server") fi - prepare_sql_test + if [ "${MRN_BUNDLED}" = "yes" ]; then + ${mroonga_dir}/test/run-sql-test.sh "${test_args[@]}" + else + prepare_sql_test - cd ${mysql_test_dir}/ - ./mysql-test-run.pl \ - "${test_args[@]}" \ - --no-check-testcases \ - --parallel="${n_processors}" \ - --retry=1 \ - --suite="${test_suite_names}" \ - --force + cd ${mysql_test_dir}/ + ./mysql-test-run.pl \ + "${test_args[@]}" \ + --no-check-testcases \ + --parallel="${n_processors}" \ + --retry=1 \ + --suite="${test_suite_names}" \ + --force + fi } build -------------- next part -------------- HTML����������������������������...Download