Kouhei Sutou
null+****@clear*****
Sun Apr 14 23:08:59 JST 2013
Kouhei Sutou 2013-04-14 23:08:59 +0900 (Sun, 14 Apr 2013) New Revision: a0d041ec31be78c7c6d809abc8b600e9905cd523 https://github.com/mroonga/mroonga/commit/a0d041ec31be78c7c6d809abc8b600e9905cd523 Message: test: make shared object name variable "eval ... $variable_name" trick is used. Added files: test/sql/include/check_ha_mroonga_so.inc Modified files: test/sql/include/have_mroonga.inc Added: test/sql/include/check_ha_mroonga_so.inc (+28 -0) 100644 =================================================================== --- /dev/null +++ test/sql/include/check_ha_mroonga_so.inc 2013-04-14 23:08:59 +0900 (59df3b8) @@ -0,0 +1,28 @@ +# Copyright(C) 2013 Kouhei Sutou <kou �� clear-code.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 include/check_windows.inc + +--disable_query_log +if ($VERSION_COMPILE_OS_WIN) +{ + let ha_mroonga_so='ha_mroonga.dll'; +} +if (!$VERSION_COMPILE_OS_WIN) +{ + let ha_mroonga_so='ha_mroonga.so'; +} +--enable_query_log Modified: test/sql/include/have_mroonga.inc (+3 -11) =================================================================== --- test/sql/include/have_mroonga.inc 2013-04-14 22:58:00 +0900 (fbf3988) +++ test/sql/include/have_mroonga.inc 2013-04-14 23:08:59 +0900 (b518c77) @@ -15,22 +15,14 @@ # 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 include/check_windows.inc +--source include/check_ha_mroonga_so.inc disable_query_log; if (!`SELECT 1 FROM information_schema.plugins WHERE plugin_name = "mroonga"`) { - if ($VERSION_COMPILE_OS_WIN) - { - INSTALL PLUGIN mroonga SONAME 'ha_mroonga.dll'; - INSTALL PLUGIN mroonga_stats SONAME 'ha_mroonga.dll'; - } - if (!$VERSION_COMPILE_OS_WIN) - { - INSTALL PLUGIN mroonga SONAME 'ha_mroonga.so'; - INSTALL PLUGIN mroonga_stats SONAME 'ha_mroonga.so'; - } + eval INSTALL PLUGIN mroonga SONAME $ha_mroonga_so; + eval INSTALL PLUGIN mroonga_stats SONAME $ha_mroonga_so; } let have_default_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_storage_engine"`; -------------- next part -------------- HTML����������������������������...ダウンロード