Kouhei Sutou
null+****@clear*****
Tue Dec 17 16:04:37 JST 2013
Kouhei Sutou 2013-12-17 16:04:37 +0900 (Tue, 17 Dec 2013) New Revision: ecc5d8f9c53852aa60f49ad1157570bda3f7f288 https://github.com/mroonga/mroonga/commit/ecc5d8f9c53852aa60f49ad1157570bda3f7f288 Message: test: skip fractional seconds related tests on MariaDB 5.5 Because MariaDB 5.5 uses other format for "SHOW CREATE TABLE". We don't want to put result file only for MariaDB 5.5. Because it reduces test maintainability. Added files: mysql-test/mroonga/include/mroonga/skip_mariadb_55.inc Modified files: mysql-test/mroonga/storage/column/timestamp/fractional_seconds/t/with_index.test mysql-test/mroonga/storage/index/primary/timestamp/t/with_fractional_seconds.test Added: mysql-test/mroonga/include/mroonga/skip_mariadb_55.inc (+24 -0) 100644 =================================================================== --- /dev/null +++ mysql-test/mroonga/include/mroonga/skip_mariadb_55.inc 2013-12-17 16:04:37 +0900 (8b46d60) @@ -0,0 +1,24 @@ +# Copyright(C) 2012-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/mroonga/check_version.inc +--source ../../include/mroonga/check_mariadb.inc + +if ($version_55) { + if ($mariadb) { + skip This test is not for MariaDB 5.5.x; + } +} Modified: mysql-test/mroonga/storage/column/timestamp/fractional_seconds/t/with_index.test (+1 -0) =================================================================== --- mysql-test/mroonga/storage/column/timestamp/fractional_seconds/t/with_index.test 2013-12-17 16:02:06 +0900 (30d27e6) +++ mysql-test/mroonga/storage/column/timestamp/fractional_seconds/t/with_index.test 2013-12-17 16:04:37 +0900 (099ad67) @@ -14,6 +14,7 @@ # 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/mroonga/skip_mariadb_55.inc --source ../../../../../include/mroonga/have_fractional_seconds.inc --source ../../../../../include/mroonga/have_mroonga.inc Modified: mysql-test/mroonga/storage/index/primary/timestamp/t/with_fractional_seconds.test (+1 -0) =================================================================== --- mysql-test/mroonga/storage/index/primary/timestamp/t/with_fractional_seconds.test 2013-12-17 16:02:06 +0900 (80258a7) +++ mysql-test/mroonga/storage/index/primary/timestamp/t/with_fractional_seconds.test 2013-12-17 16:04:37 +0900 (08ed8cb) @@ -14,6 +14,7 @@ # 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/mroonga/skip_mariadb_55.inc --source ../../../../../include/mroonga/have_fractional_seconds.inc --source ../../../../../include/mroonga/have_mroonga.inc -------------- next part -------------- HTML����������������������������...Download