shibakentoku
null+****@clear*****
Wed May 28 23:47:02 JST 2014
shibakentoku 2014-05-28 23:47:02 +0900 (Wed, 28 May 2014) New Revision: 80babc9cf7a01df608bd4b566abc731e8f3e381e https://github.com/mroonga/mroonga/commit/80babc9cf7a01df608bd4b566abc731e8f3e381e Message: add groonga_normalizer_mysql_install_dir for mysql-test after installing Modified files: mysql-test/mroonga/storage/suite.pm mysql-test/mroonga/wrapper/suite.pm Modified: mysql-test/mroonga/storage/suite.pm (+5 -0) =================================================================== --- mysql-test/mroonga/storage/suite.pm 2014-05-28 22:37:07 +0900 (b51a4a4) +++ mysql-test/mroonga/storage/suite.pm 2014-05-28 23:47:02 +0900 (528ccc5) @@ -8,11 +8,16 @@ return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or sub is_default { 1 } my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; +my $groonga_normalizer_mysql_install_dir=$::basedir . '/lib/groonga/plugins'; if (-d $groonga_normalizer_mysql_dir) { $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_dir; } +elsif (-d $groonga_normalizer_mysql_install_dir) +{ + $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_install_dir; +} bless { }; Modified: mysql-test/mroonga/wrapper/suite.pm (+5 -0) =================================================================== --- mysql-test/mroonga/wrapper/suite.pm 2014-05-28 22:37:07 +0900 (b51a4a4) +++ mysql-test/mroonga/wrapper/suite.pm 2014-05-28 23:47:02 +0900 (528ccc5) @@ -8,11 +8,16 @@ return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or sub is_default { 1 } my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; +my $groonga_normalizer_mysql_install_dir=$::basedir . '/lib/groonga/plugins'; if (-d $groonga_normalizer_mysql_dir) { $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_dir; } +elsif (-d $groonga_normalizer_mysql_install_dir) +{ + $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_install_dir; +} bless { }; -------------- next part -------------- HTML����������������������������...Download