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...
mroonga · Feb 4, 2014 · 5c0f1c1 · 5c0f1c1
1 parent 614c2be
commit 5c0f1c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/mysql-test/mroonga/storage/suite.pm b/mysql-test/mroonga/storage/suite.pm
@@ -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 { };

diff --git a/mysql-test/mroonga/wrapper/suite.pm b/mysql-test/mroonga/wrapper/suite.pm
@@ -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 { };