Kouhei Sutou
null+****@clear*****
Tue Feb 4 12:31:09 JST 2014
Kouhei Sutou 2014-02-04 12:31:09 +0900 (Tue, 04 Feb 2014) New Revision: 5c0f1c1d72e0d984e83816a2c3c78c28f3b17e44 https://github.com/mroonga/mroonga/commit/5c0f1c1d72e0d984e83816a2c3c78c28f3b17e44 Message: Support bundle only Mroonga case (maybe) For example, https://travis-ci.org/mroonga/mroonga/jobs/18172640 is a bundle only Mroonga case. I don't know about Perl so much. So this change may break existing behavior. Sorry for the case... Modified files: mysql-test/mroonga/storage/suite.pm mysql-test/mroonga/wrapper/suite.pm Modified: mysql-test/mroonga/storage/suite.pm (+4 -2) =================================================================== --- mysql-test/mroonga/storage/suite.pm 2014-02-04 12:21:53 +0900 (e326435) +++ mysql-test/mroonga/storage/suite.pm 2014-02-04 12:31:09 +0900 (b51a4a4) @@ -7,9 +7,11 @@ return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or sub is_default { 1 } -if (-d "../sql") +my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; + +if (-d $groonga_normalizer_mysql_dir) { - $ENV{GRN_PLUGINS_DIR}=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; + $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_dir; } bless { }; Modified: mysql-test/mroonga/wrapper/suite.pm (+4 -2) =================================================================== --- mysql-test/mroonga/wrapper/suite.pm 2014-02-04 12:21:53 +0900 (e326435) +++ mysql-test/mroonga/wrapper/suite.pm 2014-02-04 12:31:09 +0900 (b51a4a4) @@ -7,9 +7,11 @@ return "No Mroonga engine" unless $ENV{HA_MROONGA_SO} or sub is_default { 1 } -if (-d "../sql") +my $groonga_normalizer_mysql_dir=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; + +if (-d $groonga_normalizer_mysql_dir) { - $ENV{GRN_PLUGINS_DIR}=$::basedir . '/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql'; + $ENV{GRN_PLUGINS_DIR}=$groonga_normalizer_mysql_dir; } bless { }; -------------- next part -------------- HTML����������������������������...Download
