Kouhei Sutou
null+****@clear*****
Mon Jan 6 17:17:35 JST 2014
Kouhei Sutou 2014-01-06 17:17:35 +0900 (Mon, 06 Jan 2014) New Revision: 84b34d0349e69e7ac2123699821c21a521ea8e59 https://github.com/mroonga/mroonga/commit/84b34d0349e69e7ac2123699821c21a521ea8e59 Message: travis: test embedded server Modified files: .travis.yml tools/travis/script.sh Modified: .travis.yml (+1 -0) =================================================================== --- .travis.yml 2014-01-06 16:48:13 +0900 (911809e) +++ .travis.yml 2014-01-06 17:17:35 +0900 (eecdd5c) @@ -9,6 +9,7 @@ env: - MYSQL_VERSION=mariadb-5.5.34 - MYSQL_VERSION=mariadb-10.0.7 - MYSQL_VERSION=mariadb-10.0.7 MRN_BUNDLED=yes + - MYSQL_VERSION=mariadb-10.0.7 MRN_BUNDLED=yes MRN_TEST_EMBEDDED=yes # matrix: # allow_failures: # - env: MYSQL_VERSION=mariadb-5.5.34 Modified: tools/travis/script.sh (+8 -2) =================================================================== --- tools/travis/script.sh 2014-01-06 16:48:13 +0900 (48edc85) +++ tools/travis/script.sh 2014-01-06 17:17:35 +0900 (9eb8a80) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright(C) 2012-2013 Kouhei Sutou <kou �� clear-code.com> # @@ -88,13 +88,19 @@ prepare_sql_test() run_sql_test() { + test_args=() + if [ "${MRN_TEST_EMBEDDED}" = "yes" ]; then + test_args=("${test_args[@]}" "--embedded-server") + fi + if [ "${MRN_BUNDLED}" = "TRUE" ]; then - ${mroonga_dir}/test/run-sql-test.sh + ${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 \ -------------- next part -------------- HTML����������������������������...Download