Navigation Menu

Skip to content

Commit

Permalink
[mariadb] support test but it is failed. fixes #1152
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Oct 31, 2011
1 parent 7644289 commit 19c5a99
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
7 changes: 1 addition & 6 deletions configure.ac
Expand Up @@ -75,12 +75,7 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
fi
MYSQL_CFLAGS="$MYSQL_CFLAGS $($ac_mysql_config --cflags)"
MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
if test $ac_mysql_major_version -lt 55; then
MYSQL_VERSION="5.1"
else
MYSQL_VERSION="5.5"
fi
MYSQL_VERSION="$($ac_mysql_config --version)"
])

AC_DEFUN([CONFIG_OPTION_MECAB],[
Expand Down
22 changes: 17 additions & 5 deletions test/run-sql-test.sh
Expand Up @@ -24,12 +24,20 @@ build_mysql_test_dir="${MYSQL_BUILD}/mysql-test"
source_test_suites_dir="${source_mysql_test_dir}/suite"
build_test_suites_dir="${build_mysql_test_dir}/suite"
case "${MYSQL_VERSION}" in
5.1)
5.1.*)
plugins_dir="${MYSQL_BUILD}/lib/mysql/plugin"
if ! test -d "${build_test_suites_dir}"; then
mkdir -p "${build_test_suites_dir}"
fi
;;
5.3.*-MariaDB*)
if ! test -d "${build_test_suites_dir}"; then
ln -s "${source_test_suites_dir}" "${build_test_suites_dir}"
fi
if ! test -d "${MYSQL_BUILD}/plugin/mroonga"; then
ln -s "${top_dir}" "${MYSQL_BUILD}/plugin/mroonga"
fi
;;
*)
if ! test -d "${build_test_suites_dir}"; then
ln -s "${source_test_suites_dir}" "${build_test_suites_dir}"
Expand All @@ -47,10 +55,14 @@ for test_suite_name in groonga_include $(echo $test_suite_names | sed -e 's/,/ /
fi
done

make -C ${top_dir} \
install-pluginLTLIBRARIES \
plugindir=${plugins_dir} > /dev/null || \
exit 1
if test -n "${plugins_dir}"; then
make -C ${top_dir} \
install-pluginLTLIBRARIES \
plugindir=${plugins_dir} > /dev/null || \
exit 1
else
make -C ${top_dir} > /dev/null || exit 1
fi

(cd "$build_mysql_test_dir" && \
./mysql-test-run.pl \
Expand Down

0 comments on commit 19c5a99

Please sign in to comment.