null+****@clear*****
null+****@clear*****
2011年 7月 12日 (火) 18:11:16 JST
Kouhei Sutou 2011-07-12 09:11:16 +0000 (Tue, 12 Jul 2011)
New Revision: f018eaaf4fb763fbf1647f1d4fd964fb210a23ac
Log:
[test] split a test suite for storage mode and wrapper mode.
Modified files:
test/run-sql-test.sh
Renamed files:
test/sql/groonga_include/groonga.inc
(from test/sql/include/groonga.inc)
test/sql/groonga_include/groonga_deinit.inc
(from test/sql/include/groonga_deinit.inc)
test/sql/groonga_storage/r/Makefile.am
(from test/sql/r/Makefile.am)
test/sql/groonga_storage/r/auto_increment.result
(from test/sql/r/auto_increment.result)
test/sql/groonga_storage/r/binlog.result
(from test/sql/r/binlog.result)
test/sql/groonga_storage/r/btree.result
(from test/sql/r/btree.result)
test/sql/groonga_storage/r/count_performance.result
(from test/sql/r/count_performance.result)
test/sql/groonga_storage/r/create_table.result
(from test/sql/r/create_table.result)
test/sql/groonga_storage/r/delete.result
(from test/sql/r/delete.result)
test/sql/groonga_storage/r/drop_database.result
(from test/sql/r/drop_database.result)
test/sql/groonga_storage/r/drop_table.result
(from test/sql/r/drop_table.result)
test/sql/groonga_storage/r/flush_logs.result
(from test/sql/r/flush_logs.result)
test/sql/groonga_storage/r/fulltext.result
(from test/sql/r/fulltext.result)
test/sql/groonga_storage/r/hash.result
(from test/sql/r/hash.result)
test/sql/groonga_storage/r/information_schema.result
(from test/sql/r/information_schema.result)
test/sql/groonga_storage/r/insert.result
(from test/sql/r/insert.result)
test/sql/groonga_storage/r/last_insert_grn_id.result
(from test/sql/r/last_insert_grn_id.result)
test/sql/groonga_storage/r/log_level.result
(from test/sql/r/log_level.result)
test/sql/groonga_storage/r/order_limit_performance.result
(from test/sql/r/order_limit_performance.result)
test/sql/groonga_storage/r/replace.result
(from test/sql/r/replace.result)
test/sql/groonga_storage/r/select_all.result
(from test/sql/r/select_all.result)
test/sql/groonga_storage/r/select_pkey.result
(from test/sql/r/select_pkey.result)
test/sql/groonga_storage/r/select_secondary_key.result
(from test/sql/r/select_secondary_key.result)
test/sql/groonga_storage/r/show_create_table.result
(from test/sql/r/show_create_table.result)
test/sql/groonga_storage/r/show_table_status.result
(from test/sql/r/show_table_status.result)
test/sql/groonga_storage/r/tinyint.result
(from test/sql/r/tinyint.result)
test/sql/groonga_storage/r/update.result
(from test/sql/r/update.result)
test/sql/groonga_storage/t/Makefile.am
(from test/sql/t/Makefile.am)
test/sql/groonga_storage/t/auto_increment.test
(from test/sql/t/auto_increment.test)
test/sql/groonga_storage/t/binlog.test
(from test/sql/t/binlog.test)
test/sql/groonga_storage/t/btree.test
(from test/sql/t/btree.test)
test/sql/groonga_storage/t/count_performance.test
(from test/sql/t/count_performance.test)
test/sql/groonga_storage/t/create_table.test
(from test/sql/t/create_table.test)
test/sql/groonga_storage/t/delete.test
(from test/sql/t/delete.test)
test/sql/groonga_storage/t/drop_database.test
(from test/sql/t/drop_database.test)
test/sql/groonga_storage/t/drop_table.test
(from test/sql/t/drop_table.test)
test/sql/groonga_storage/t/flush_logs.test
(from test/sql/t/flush_logs.test)
test/sql/groonga_storage/t/fulltext.test
(from test/sql/t/fulltext.test)
test/sql/groonga_storage/t/hash.test
(from test/sql/t/hash.test)
test/sql/groonga_storage/t/information_schema.test
(from test/sql/t/information_schema.test)
test/sql/groonga_storage/t/insert.test
(from test/sql/t/insert.test)
test/sql/groonga_storage/t/last_insert_grn_id.test
(from test/sql/t/last_insert_grn_id.test)
test/sql/groonga_storage/t/log_level.test
(from test/sql/t/log_level.test)
test/sql/groonga_storage/t/order_limit_performance.test
(from test/sql/t/order_limit_performance.test)
test/sql/groonga_storage/t/replace.test
(from test/sql/t/replace.test)
test/sql/groonga_storage/t/select_all.test
(from test/sql/t/select_all.test)
test/sql/groonga_storage/t/select_pkey.test
(from test/sql/t/select_pkey.test)
test/sql/groonga_storage/t/select_secondary_key.test
(from test/sql/t/select_secondary_key.test)
test/sql/groonga_storage/t/show_create_table.test
(from test/sql/t/show_create_table.test)
test/sql/groonga_storage/t/show_table_status.test
(from test/sql/t/show_table_status.test)
test/sql/groonga_storage/t/tinyint.test
(from test/sql/t/tinyint.test)
test/sql/groonga_storage/t/update.test
(from test/sql/t/update.test)
test/sql/groonga_wrapper/r/create_table.result
(from test/sql/r/create_table_wrapper.result)
test/sql/groonga_wrapper/r/delete.result
(from test/sql/r/delete_wrapper.result)
test/sql/groonga_wrapper/r/fulltext.result
(from test/sql/r/fulltext_wrapper.result)
test/sql/groonga_wrapper/r/fulltext_multiple_column_index.result
(from test/sql/r/fulltext_multiple_column_index_wrapper.result)
test/sql/groonga_wrapper/r/insert.result
(from test/sql/r/insert_wrapper.result)
test/sql/groonga_wrapper/r/update.result
(from test/sql/r/update_wrapper.result)
test/sql/groonga_wrapper/t/create_table.test
(from test/sql/t/create_table_wrapper.test)
test/sql/groonga_wrapper/t/delete.test
(from test/sql/t/delete_wrapper.test)
test/sql/groonga_wrapper/t/fulltext.test
(from test/sql/t/fulltext_wrapper.test)
test/sql/groonga_wrapper/t/fulltext_multiple_column_index.test
(from test/sql/t/fulltext_multiple_column_index_wrapper.test)
test/sql/groonga_wrapper/t/insert.test
(from test/sql/t/insert_wrapper.test)
test/sql/groonga_wrapper/t/update.test
(from test/sql/t/update_wrapper.test)
Modified: test/run-sql-test.sh (+10 -8)
===================================================================
--- test/run-sql-test.sh 2011-07-11 16:53:44 +0000 (e9cdc11)
+++ test/run-sql-test.sh 2011-07-12 09:11:16 +0000 (baef484)
@@ -18,13 +18,11 @@ if test -z "$MYSQL_VERSION"; then
fi
export MYSQL_VERSION
-test_suite_name="groonga"
-local_groonga_mysql_test_suite_dir="${BASE_DIR}/sql"
+test_suite_names="groonga_storage,groonga_wrapper"
source_mysql_test_dir="${MYSQL_SOURCE}/mysql-test"
build_mysql_test_dir="${MYSQL_BUILD}/mysql-test"
source_test_suites_dir="${source_mysql_test_dir}/suite"
build_test_suites_dir="${build_mysql_test_dir}/suite"
-groonga_mysql_test_suite_dir="${build_test_suites_dir}/${test_suite_name}"
case "${MYSQL_VERSION}" in
5.1)
plugins_dir="${MYSQL_BUILD}/lib/mysql/plugin"
@@ -40,13 +38,17 @@ case "${MYSQL_VERSION}" in
;;
esac
-if ! test -e "${groonga_mysql_test_suite_dir}"; then
- ln -s "${local_groonga_mysql_test_suite_dir}" \
- "${groonga_mysql_test_suite_dir}"
-fi
+for test_suite_name in groonga_include $(echo $test_suite_names | sed -e 's/,/ /g'); do
+ local_groonga_mysql_test_suite_dir="${BASE_DIR}/sql/${test_suite_name}"
+ groonga_mysql_test_suite_dir="${build_test_suites_dir}/${test_suite_name}"
+ if ! test -e "${groonga_mysql_test_suite_dir}"; then
+ ln -s "${local_groonga_mysql_test_suite_dir}" \
+ "${groonga_mysql_test_suite_dir}"
+ fi
+done
make -C ${top_dir} install-pluginLTLIBRARIES plugindir=${plugins_dir} > /dev/null
(cd "$build_mysql_test_dir" && \
./mysql-test-run.pl --no-check-testcases \
- --suite="${test_suite_name}" --force "$@")
+ --suite="${test_suite_names}" --force "$@")
Renamed: test/sql/groonga_include/groonga.inc (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_include/groonga_deinit.inc (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/Makefile.am (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/auto_increment.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/binlog.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/btree.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/count_performance.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/create_table.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/delete.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/drop_database.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/drop_table.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/flush_logs.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/fulltext.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/hash.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/information_schema.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/insert.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/last_insert_grn_id.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/log_level.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/order_limit_performance.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/replace.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/select_all.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/select_pkey.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/select_secondary_key.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/show_create_table.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/show_table_status.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/tinyint.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/r/update.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/t/Makefile.am (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_storage/t/auto_increment.test (+2 -2) 95%
===================================================================
--- test/sql/t/auto_increment.test 2011-07-11 16:53:44 +0000 (7f51381)
+++ test/sql/groonga_storage/t/auto_increment.test 2011-07-12 09:11:16 +0000 (2037445)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1;
@@ -50,4 +50,4 @@ insert into t1 values(6, null);
select * from t1 order by c2 desc limit 1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/binlog.test (+2 -2) 94%
===================================================================
--- test/sql/t/binlog.test 2011-07-11 16:53:44 +0000 (8ecff04)
+++ test/sql/groonga_storage/t/binlog.test 2011-07-12 09:11:16 +0000 (b956139)
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
source include/have_log_bin.inc;
-source suite/groonga/include/groonga.inc;
+source suite/groonga_include/groonga.inc;
--disable_warnings
drop table if exists t1;
@@ -50,4 +50,4 @@ commit;
select * from t1;
drop table t1;
-source suite/groonga/include/groonga_deinit.inc;
+source suite/groonga_include/groonga_deinit.inc;
Renamed: test/sql/groonga_storage/t/btree.test (+2 -2) 92%
===================================================================
--- test/sql/t/btree.test 2011-07-11 16:53:44 +0000 (2b59b6f)
+++ test/sql/groonga_storage/t/btree.test 2011-07-12 09:11:16 +0000 (ab26949)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -30,4 +30,4 @@ flush tables;
select * from t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/count_performance.test (+2 -2) 96%
===================================================================
--- test/sql/t/count_performance.test 2011-07-11 16:53:44 +0000 (9b2b23a)
+++ test/sql/groonga_storage/t/count_performance.test 2011-07-12 09:11:16 +0000 (2c7d004)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -57,4 +57,4 @@ select count(*) from t1 force index(idx1) where c2 between 20 and 40;
show status like 'groonga_count_skip';
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/create_table.test (+2 -2) 97%
===================================================================
--- test/sql/t/create_table.test 2011-07-11 16:53:44 +0000 (2a09fd3)
+++ test/sql/groonga_storage/t/create_table.test 2011-07-12 09:11:16 +0000 (c129456)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -151,4 +151,4 @@ create table t1 (_id int, c1 int, key (_id));
create table t1 (_id int, c1 int, key (_id) using hash);
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/delete.test (+2 -2) 95%
===================================================================
--- test/sql/t/delete.test 2011-07-11 16:53:44 +0000 (ef09677)
+++ test/sql/groonga_storage/t/delete.test 2011-07-12 09:11:16 +0000 (acb2f30)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -75,4 +75,4 @@ delete from t1 where _id = 2;
select * from t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/drop_database.test (+2 -2) 93%
===================================================================
--- test/sql/t/drop_database.test 2011-07-11 16:53:44 +0000 (131355e)
+++ test/sql/groonga_storage/t/drop_database.test 2011-07-12 09:11:16 +0000 (442789e)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop database if exists groonga;
@@ -36,4 +36,4 @@ create table t2 (c1 int primary key, c2 varchar(255)) default charset utf8;
drop table t1, t2;
drop database groonga;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/drop_table.test (+2 -2) 91%
===================================================================
--- test/sql/t/drop_table.test 2011-07-11 16:53:44 +0000 (0792238)
+++ test/sql/groonga_storage/t/drop_table.test 2011-07-12 09:11:16 +0000 (3e6de8d)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -28,4 +28,4 @@ drop table t1;
drop table t2;
drop table t3;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/flush_logs.test (+2 -2) 89%
===================================================================
--- test/sql/t/flush_logs.test 2011-07-11 16:53:44 +0000 (1a441dc)
+++ test/sql/groonga_storage/t/flush_logs.test 2011-07-12 09:11:16 +0000 (c294b51)
@@ -14,8 +14,8 @@
# 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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
flush logs;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/fulltext.test (+2 -2) 97%
===================================================================
--- test/sql/t/fulltext.test 2011-07-11 16:53:44 +0000 (851aa23)
+++ test/sql/groonga_storage/t/fulltext.test 2011-07-12 09:11:16 +0000 (e4d5450)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -98,4 +98,4 @@ select * from t1 where c2 >= 15 and not match(c3) against("uu");
select * from t1 where c2 < 15 and not match(c3) against("uu");
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/hash.test (+2 -2) 95%
===================================================================
--- test/sql/t/hash.test 2011-07-11 16:53:44 +0000 (c6615ef)
+++ test/sql/groonga_storage/t/hash.test 2011-07-12 09:11:16 +0000 (acd4ee7)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -64,4 +64,4 @@ select * from t1 where _id = 2;
select * from t1 where _id = 20;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/information_schema.test (+2 -2) 90%
===================================================================
--- test/sql/t/information_schema.test 2011-07-11 16:53:44 +0000 (ae2a00d)
+++ test/sql/groonga_storage/t/information_schema.test 2011-07-12 09:11:16 +0000 (3791594)
@@ -14,8 +14,8 @@
# 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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
select count(*) from information_schema.plugins where plugin_name = "groonga";
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/insert.test (+2 -2) 96%
===================================================================
--- test/sql/t/insert.test 2011-07-11 16:53:44 +0000 (feec3ec)
+++ test/sql/groonga_storage/t/insert.test 2011-07-12 09:11:16 +0000 (825b65b)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -106,4 +106,4 @@ insert into t1 values(1,200);
select * from t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/last_insert_grn_id.test (+2 -2) 94%
===================================================================
--- test/sql/t/last_insert_grn_id.test 2011-07-11 16:53:44 +0000 (05daf9c)
+++ test/sql/groonga_storage/t/last_insert_grn_id.test 2011-07-12 09:11:16 +0000 (3e5df4a)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -45,4 +45,4 @@ drop table t1;
drop function last_insert_grn_id;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/log_level.test (+2 -2) 94%
===================================================================
--- test/sql/t/log_level.test 2011-07-11 16:53:44 +0000 (9e3c616)
+++ test/sql/groonga_storage/t/log_level.test 2011-07-12 09:11:16 +0000 (e107c08)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
show global variables like 'groonga_log_level';
@@ -54,4 +54,4 @@ set global groonga_log_level=dummy;
--error 1229
set session groonga_log_level=NOTICE;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/order_limit_performance.test (+2 -2) 97%
===================================================================
--- test/sql/t/order_limit_performance.test 2011-07-11 16:53:44 +0000 (88afa9d)
+++ test/sql/groonga_storage/t/order_limit_performance.test 2011-07-12 09:11:16 +0000 (93b42f4)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1;
@@ -65,4 +65,4 @@ select * from t1 where match(c3) against("ii") order by c1 desc limit 1;
show status like 'groonga_fast_order_limit';
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/replace.test (+2 -2) 95%
===================================================================
--- test/sql/t/replace.test 2011-07-11 16:53:44 +0000 (d30a7e3)
+++ test/sql/groonga_storage/t/replace.test 2011-07-12 09:11:16 +0000 (c7e426f)
@@ -16,7 +16,7 @@
# Based on #910.
---source suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
DROP TABLE IF EXISTS videos_master, videos_groonga;
@@ -59,4 +59,4 @@ SELECT * FROM videos_groonga WHERE MATCH(description) AGAINST("my");
DROP TABLE videos_master, videos_groonga;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/select_all.test (+2 -2) 96%
===================================================================
--- test/sql/t/select_all.test 2011-07-11 16:53:44 +0000 (64ecff3)
+++ test/sql/groonga_storage/t/select_all.test 2011-07-12 09:11:16 +0000 (12f64a2)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -97,4 +97,4 @@ select * from t1 where _id < 3;
select * from t1 where _id >= 3;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/select_pkey.test (+2 -2) 93%
===================================================================
--- test/sql/t/select_pkey.test 2011-07-11 16:53:44 +0000 (8b032b1)
+++ test/sql/groonga_storage/t/select_pkey.test 2011-07-12 09:11:16 +0000 (404e974)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -37,4 +37,4 @@ select * from t1 where c1=6;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/select_secondary_key.test (+2 -2) 95%
===================================================================
--- test/sql/t/select_secondary_key.test 2011-07-11 16:53:44 +0000 (9916328)
+++ test/sql/groonga_storage/t/select_secondary_key.test 2011-07-12 09:11:16 +0000 (846f923)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -48,4 +48,4 @@ select * from t1 force index(idx1) where c2 > 'e';
select * from t1 force index(idx1) where c2 between 'c' and 'h';
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/show_create_table.test (+2 -2) 91%
===================================================================
--- test/sql/t/show_create_table.test 2011-07-11 16:53:44 +0000 (743e840)
+++ test/sql/groonga_storage/t/show_create_table.test 2011-07-12 09:11:16 +0000 (754c977)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -32,4 +32,4 @@ create table t1 (c1 int primary key, c2 varchar(100));
show create table t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/show_table_status.test (+2 -2) 91%
===================================================================
--- test/sql/t/show_table_status.test 2011-07-11 16:53:44 +0000 (90ee984)
+++ test/sql/groonga_storage/t/show_table_status.test 2011-07-12 09:11:16 +0000 (ae886e9)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -30,4 +30,4 @@ show table status like 't2';
drop table t1,t2;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/tinyint.test (+2 -2) 93%
===================================================================
--- test/sql/t/tinyint.test 2011-07-11 16:53:44 +0000 (d52d279)
+++ test/sql/groonga_storage/t/tinyint.test 2011-07-12 09:11:16 +0000 (648736e)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists books;
@@ -32,4 +32,4 @@ select count(*) from books where published != 1;
drop table books;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_storage/t/update.test (+2 -2) 96%
===================================================================
--- test/sql/t/update.test 2011-07-11 16:53:44 +0000 (6abae11)
+++ test/sql/groonga_storage/t/update.test 2011-07-12 09:11:16 +0000 (e9d7511)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -99,4 +99,4 @@ update t1 set c1 = 200 where _id = 2;
select * from t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/r/create_table.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/delete.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/fulltext.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/fulltext_multiple_column_index.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/insert.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/r/update.result (+0 -0) 100%
===================================================================
Renamed: test/sql/groonga_wrapper/t/create_table.test (+2 -2) 97%
===================================================================
--- test/sql/t/create_table_wrapper.test 2011-07-11 16:53:44 +0000 (b8e39dd)
+++ test/sql/groonga_wrapper/t/create_table.test 2011-07-12 09:11:16 +0000 (d406580)
@@ -15,7 +15,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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -95,4 +95,4 @@ drop table t1;
--error 1173
create table t1 (c1 int) COMMENT = 'engine "innodb"';
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/t/delete.test (+2 -2) 94%
===================================================================
--- test/sql/t/delete_wrapper.test 2011-07-11 16:53:44 +0000 (54b9071)
+++ test/sql/groonga_wrapper/t/delete.test 2011-07-12 09:11:16 +0000 (9be8d84)
@@ -15,7 +15,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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -55,4 +55,4 @@ select * from t1 where match(c2) against("ki");
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/t/fulltext.test (+2 -2) 98%
===================================================================
--- test/sql/t/fulltext_wrapper.test 2011-07-11 16:53:44 +0000 (b7de87d)
+++ test/sql/groonga_wrapper/t/fulltext.test 2011-07-12 09:11:16 +0000 (a335917)
@@ -15,7 +15,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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -99,4 +99,4 @@ select * from t1 where c2 >= 15 and not match(c3) against("uu");
select * from t1 where c2 < 15 and not match(c3) against("uu");
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/t/fulltext_multiple_column_index.test (+2 -2) 94%
===================================================================
--- test/sql/t/fulltext_multiple_column_index_wrapper.test 2011-07-11 16:53:44 +0000 (a9be016)
+++ test/sql/groonga_wrapper/t/fulltext_multiple_column_index.test 2011-07-12 09:11:16 +0000 (2b1f566)
@@ -14,7 +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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists diaries;
@@ -37,4 +37,4 @@ select * from diaries where match(title) against("富士山");
select * from diaries where match(content) against("富士山");
drop table diaries;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/t/insert.test (+2 -2) 96%
===================================================================
--- test/sql/t/insert_wrapper.test 2011-07-11 16:53:44 +0000 (50d48e9)
+++ test/sql/groonga_wrapper/t/insert.test 2011-07-12 09:11:16 +0000 (c3cf9e9)
@@ -15,7 +15,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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -87,4 +87,4 @@ insert into t1 values(1,200);
select * from t1;
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc
Renamed: test/sql/groonga_wrapper/t/update.test (+2 -2) 94%
===================================================================
--- test/sql/t/update_wrapper.test 2011-07-11 16:53:44 +0000 (69dc107)
+++ test/sql/groonga_wrapper/t/update.test 2011-07-12 09:11:16 +0000 (9d7d2cd)
@@ -15,7 +15,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 suite/groonga/include/groonga.inc
+--source suite/groonga_include/groonga.inc
--disable_warnings
drop table if exists t1, t2, t3;
@@ -50,4 +50,4 @@ select * from t1 where match(c2) against("ki");
drop table t1;
---source suite/groonga/include/groonga_deinit.inc
+--source suite/groonga_include/groonga_deinit.inc