Update Mroonga to the latest version on 2015-02-17T13:34:27+0900

3 files changed, 85 insertions, 32 deletions

diff --git a/storage/mroonga/vendor/groonga/tools/travis-before-script.sh b/storage/mroonga/vendor/groonga/tools/travis-before-script.sh
index 943f41b0013..71d5a816b87 100755
--- a/storage/mroonga/vendor/groonga/tools/travis-before-script.sh
+++ b/storage/mroonga/vendor/groonga/tools/travis-before-script.sh
@@ -4,30 +4,46 @@ set -e
 
 git submodule update --init --depth 1
 
+prefix=/tmp/local
+
 case "${BUILD_TOOL}" in
-    autotools)
-	./autogen.sh
-
-	configure_args=""
-	#if [ "$CC" = "clang" ]; then
-	    configure_args="${configure_args} --enable-debug"
-	#fi
-	if [ "$ENABLE_MRUBY" = "yes" ]; then
-	    configure_args="${configure_args} --with-ruby --enable-mruby"
-	fi
-
-	./configure --with-ruby ${configure_args}
-	;;
-    cmake)
-	cmake_args=""
-	cmake_args="${cmake_args} -DGRN_WITH_DEBUG=yes"
-	if [ "$ENABLE_MRUBY" = "yes" ]; then
-	    cmake_args="${cmake_args} -DGRN_WITH_MRUBY=yes"
-	fi
-
-	cmake . ${cmake_args}
-	;;
+  autotools)
+    ./autogen.sh
+
+    configure_args=""
+    #if [ "$CC" = "clang" ]; then
+      configure_args="${configure_args} --enable-debug"
+    #fi
+    if [ "$ENABLE_MRUBY" = "yes" ]; then
+      configure_args="${configure_args} --with-ruby --enable-mruby"
+    fi
+    if [ "$ENABLE_JEMALLOC" = "yes" ]; then
+      configure_args="${configure_args} --with-jemalloc"
+    fi
+
+    ./configure --prefix=${prefix} --with-ruby ${configure_args}
+    ;;
+  cmake)
+    cmake_args=""
+    cmake_args="${cmake_args} -DGRN_WITH_DEBUG=yes"
+    if [ "$ENABLE_MRUBY" = "yes" ]; then
+      cmake_args="${cmake_args} -DGRN_WITH_MRUBY=yes"
+    fi
+
+    cmake . ${cmake_args}
+    ;;
+esac
+
+case "$(uname)" in
+  Linux)
+    n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)"
+    ;;
+  Darwin)
+    n_processors="$(/usr/sbin/sysctl -n hw.ncpu)"
+    ;;
+  *)
+    n_processors="1"
+    ;;
 esac
 
-n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)"
 make -j${n_processors} > /dev/null
diff --git a/storage/mroonga/vendor/groonga/tools/travis-install.sh b/storage/mroonga/vendor/groonga/tools/travis-install.sh
new file mode 100755
index 00000000000..e64e17b9872
--- /dev/null
+++ b/storage/mroonga/vendor/groonga/tools/travis-install.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "${TRAVIS_OS_NAME}" in
+  linux)
+    curl --silent --location https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh
+    sudo apt-get install -qq -y \
+         autotools-dev \
+         zlib1g-dev \
+         libmsgpack-dev \
+         libevent-dev \
+         libmecab-dev \
+         mecab-naist-jdic \
+         cmake
+    if [ "${ENABLE_JEMALLOC}" = "yes" ]; then
+      sudo apt-get install -qq -y libjemalloc-dev
+    fi
+    ;;
+  osx)
+    brew install \
+         msgpack \
+         libevent \
+         mecab \
+         mecab-ipadic
+    ;;
+esac
+
+if [ "${ENABLE_MRUBY}" = "yes" ]; then
+  gem install pkg-config groonga-client
+fi
diff --git a/storage/mroonga/vendor/groonga/tools/travis-script.sh b/storage/mroonga/vendor/groonga/tools/travis-script.sh
index 7931903d419..35bf0bd1c9e 100755
--- a/storage/mroonga/vendor/groonga/tools/travis-script.sh
+++ b/storage/mroonga/vendor/groonga/tools/travis-script.sh
@@ -2,14 +2,20 @@
 
 set -e
 
+prefix=/tmp/local
+
 case "${BUILD_TOOL}" in
-    autotools)
-	test/unit/run-test.sh
-	test/command/run-test.sh
-	# test/command/run-test.sh --interface http
-	# test/command/run-test.sh --interface http --testee groonga-httpd
-	;;
-    cmake)
-	test/command/run-test.sh
-	;;
+  autotools)
+    test/unit/run-test.sh
+    test/command/run-test.sh
+    if [ "${ENABLE_MRUBY}" = "yes" ]; then
+      test/query_optimizer/run-test.rb
+    fi
+    test/command/run-test.sh --interface http
+    mkdir -p ${prefix}/var/log/groonga/httpd
+    test/command/run-test.sh --testee groonga-httpd
+    ;;
+  cmake)
+    test/command/run-test.sh
+    ;;
 esac