null+****@clear*****
null+****@clear*****
2012年 3月 18日 (日) 19:02:51 JST
Kouhei Sutou 2012-03-18 19:02:51 +0900 (Sun, 18 Mar 2012)
New Revision: 634477efb04e8631be7857859b64ac2d6ac6dd99
Log:
wrapper innodb test: don't change global include files
refs #1195
Modified files:
test/run-sql-test.sh
Modified: test/run-sql-test.sh (+5 -2)
===================================================================
--- test/run-sql-test.sh 2012-03-18 19:01:15 +0900 (3d103c5)
+++ test/run-sql-test.sh 2012-03-18 19:02:51 +0900 (663da4a)
@@ -92,16 +92,19 @@ if test "$0" -nt "$(dirname "${mroonga_wrapper_innodb_test_suite_dir}")"; then
fi
if ! test -d "${mroonga_wrapper_innodb_test_suite_dir}"; then
cp -rp "${innodb_test_suite_dir}" "${mroonga_wrapper_innodb_test_suite_dir}"
+ cp -rp "${build_test_include_dir}"/innodb[-_]*.inc \
+ "${mroonga_wrapper_innodb_test_suite_dir}/include/"
ruby -i'' \
-pe "\$_.gsub!(/\\bengine\\s*=\\s*innodb\\b([^;\\n]*)/i,
\"ENGINE=mroonga\\\1 COMMENT='ENGINE \\\"InnoDB\\\"'\")
\$_.gsub!(/\\b(storage_engine\\s*=\\s*)innodb\\b([^;\\n]*)/i,
\"\\\1mroonga\")
+ \$_.gsub!(/^(--\\s*source\\s+)(include\\/innodb)/i,
+ \"\\\1suite/mroonga_wrapper_innodb/\\\2\")
" \
${mroonga_wrapper_innodb_test_suite_dir}/r/*.result \
${mroonga_wrapper_innodb_test_suite_dir}/t/*.test \
- ${mroonga_wrapper_innodb_test_suite_dir}/include/*.inc \
- ${build_test_include_dir}/innodb_*.inc # over our work. :<
+ ${mroonga_wrapper_innodb_test_suite_dir}/include/*.inc
sed -i'' \
-e '1 i --source include/have_mroonga.inc' \
${mroonga_wrapper_innodb_test_suite_dir}/t/*.test