null+****@clear*****
null+****@clear*****
2011年 11月 11日 (金) 16:13:52 JST
Kazuhiko 2011-11-11 07:13:52 +0000 (Fri, 11 Nov 2011)
New Revision: 8418d75dd00a12a3a8fc2ee9e4c9479e45f8a44f
Log:
[test] skip some tests if version is less than 5.5.
Added files:
test/sql/include/have_fulltext_index_comment.inc
test/sql/include/have_inplace_index_change.inc
Modified files:
test/run-sql-test.sh
test/sql/suite/groonga_storage/t/fulltext_index_recreate.test
test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test
test/sql/suite/groonga_storage/t/fulltext_parser_comment.test
test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test
test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test
test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test
test/sql/suite/groonga_wrapper/t/fulltext_parser_comment.test
Modified: test/run-sql-test.sh (+1 -2)
===================================================================
--- test/run-sql-test.sh 2011-11-11 07:06:51 +0000 (ec027a1)
+++ test/run-sql-test.sh 2011-11-11 07:13:52 +0000 (e637ed5)
@@ -18,7 +18,6 @@ if test -z "$MYSQL_VERSION"; then
fi
export MYSQL_VERSION
-test_include_names="have_groonga.inc,have_groonga_deinit.inc"
test_suite_names="groonga_storage,groonga_wrapper"
source_mysql_test_dir="${MYSQL_SOURCE}/mysql-test"
build_mysql_test_dir="${MYSQL_BUILD}/mysql-test"
@@ -49,7 +48,7 @@ case "${MYSQL_VERSION}" in
esac
local_groonga_mysql_test_include_dir="${BASE_DIR}/sql/include"
-for test_include_name in $(echo $test_include_names | sed -e 's/,/ /g'); do
+for test_include_name in $(ls $local_groonga_mysql_test_include_dir | grep '\.inc$'); do
if ! test -e "${build_test_include_dir}/${test_include_name}"; then
ln -s "${local_groonga_mysql_test_include_dir}/${test_include_name}" \
"${build_test_include_dir}"
Added: test/sql/include/have_fulltext_index_comment.inc (+7 -0) 100644
===================================================================
--- /dev/null
+++ test/sql/include/have_fulltext_index_comment.inc 2011-11-11 07:13:52 +0000 (2dedd63)
@@ -0,0 +1,7 @@
+--disable_query_log
+let $fulltext_index_comment = `SELECT @@global.version >= '5.5'`;
+--enable_query_log
+if (!$fulltext_index_comment)
+{
+ skip Fulltext index comment is available in version 5.5 or later;
+}
Added: test/sql/include/have_inplace_index_change.inc (+7 -0) 100644
===================================================================
--- /dev/null
+++ test/sql/include/have_inplace_index_change.inc 2011-11-11 07:13:52 +0000 (e68cbc7)
@@ -0,0 +1,7 @@
+--disable_query_log
+let $inplace_index_change = `SELECT @@global.version >= '5.5'`;
+--enable_query_log
+if (!$inplace_index_change)
+{
+ skip Inplace index change is availavle in version 5.5 or later;
+}
Modified: test/sql/suite/groonga_storage/t/fulltext_index_recreate.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_storage/t/fulltext_index_recreate.test 2011-11-11 07:06:51 +0000 (35623f6)
+++ test/sql/suite/groonga_storage/t/fulltext_index_recreate.test 2011-11-11 07:13:52 +0000 (5762332)
@@ -14,6 +14,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
+--source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test 2011-11-11 07:06:51 +0000 (53b87f6)
+++ test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test 2011-11-11 07:13:52 +0000 (cd7832e)
@@ -14,6 +14,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
+--source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_storage/t/fulltext_parser_comment.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_storage/t/fulltext_parser_comment.test 2011-11-11 07:06:51 +0000 (08790d3)
+++ test/sql/suite/groonga_storage/t/fulltext_parser_comment.test 2011-11-11 07:13:52 +0000 (e7e0c05)
@@ -14,6 +14,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
+--source include/have_fulltext_index_comment.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test 2011-11-11 07:06:51 +0000 (b789bf2)
+++ test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test 2011-11-11 07:13:52 +0000 (c4f1bf4)
@@ -14,6 +14,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
+--source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test 2011-11-11 07:06:51 +0000 (ff0d4fd)
+++ test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test 2011-11-11 07:13:52 +0000 (c8c4f47)
@@ -14,6 +14,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
+--source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test 2011-11-11 07:06:51 +0000 (96301cf)
+++ test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test 2011-11-11 07:13:52 +0000 (50d7782)
@@ -14,6 +14,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
+--source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_wrapper/t/fulltext_parser_comment.test (+1 -0)
===================================================================
--- test/sql/suite/groonga_wrapper/t/fulltext_parser_comment.test 2011-11-11 07:06:51 +0000 (05e6088)
+++ test/sql/suite/groonga_wrapper/t/fulltext_parser_comment.test 2011-11-11 07:13:52 +0000 (1041960)
@@ -14,6 +14,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
+--source include/have_fulltext_index_comment.inc
--source include/have_groonga.inc
--disable_warnings