null+****@clear*****
null+****@clear*****
2012年 3月 6日 (火) 19:05:38 JST
Kouhei Sutou 2012-03-06 19:05:38 +0900 (Tue, 06 Mar 2012)
New Revision: a3cfc9e4c7e51fa47939a5aa70d0d12ff02762f1
Log:
[test][function] pass groonga-suggest-create-dataset
Modified files:
Makefile.am
configure.ac
test/function/Makefile.am
test/function/run-test.sh
Modified: Makefile.am (+3 -0)
===================================================================
--- Makefile.am 2012-03-06 16:09:48 +0900 (595030d)
+++ Makefile.am 2012-03-06 19:05:38 +0900 (e57d655)
@@ -113,3 +113,6 @@ endif
echo-groonga:
@echo $(GROONGA)
+
+echo-groonga-suggest-create-dataset:
+ @echo $(GROONGA_SUGGEST_CREATE_DATASET)
Modified: configure.ac (+4 -0)
===================================================================
--- configure.ac 2012-03-06 16:09:48 +0900 (dc04e53)
+++ configure.ac 2012-03-06 19:05:38 +0900 (a573560)
@@ -618,6 +618,10 @@ AC_SUBST(GROONGA)
GRNTEST="\$(abs_top_builddir)/src/grntest"
AC_SUBST(GRNTEST)
+# groonga-suggest-create-dataset binary path
+GROONGA_SUGGEST_CREATE_DATASET="\$(abs_top_builddir)/src/suggest/groonga-suggest-create-dataset"
+AC_SUBST(GROONGA_SUGGEST_CREATE_DATASET)
+
# check Cutter with GLib support if available
REQUIRED_MINIMUM_CUTTER_VERSION=1.1.6
REQUIRED_MINIMUM_CPPCUTTER_VERSION=1.2.0
Modified: test/function/Makefile.am (+6 -5)
===================================================================
--- test/function/Makefile.am 2012-03-06 16:09:48 +0900 (8a805a1)
+++ test/function/Makefile.am 2012-03-06 19:05:38 +0900 (1fe8cdc)
@@ -6,11 +6,12 @@ SUBDIRS = \
if WITH_FUNCTION_TEST
TESTS = run-test.sh
endif
-TESTS_ENVIRONMENT = \
- NO_MAKE=yes \
- BUILD_DIR="$(builddir)" \
- RUBY="$(RUBY)" \
- GROONGA="$(GROONGA)"
+TESTS_ENVIRONMENT = \
+ NO_MAKE=yes \
+ BUILD_DIR="$(builddir)" \
+ RUBY="$(RUBY)" \
+ GROONGA="$(GROONGA)" \
+ GROONGA_SUGGEST_CREATE_DATASET="$(GROONGA_SUGGEST_CREATE_DATASET)"
EXTRA_DIST = \
run-test.sh
Modified: test/function/run-test.sh (+6 -0)
===================================================================
--- test/function/run-test.sh 2012-03-06 16:09:48 +0900 (05d7f15)
+++ test/function/run-test.sh 2012-03-06 19:05:38 +0900 (0c256a3)
@@ -23,6 +23,11 @@ if test -z "$GROONGA"; then
fi
export GROONGA
+if test -z "$GROONGA_SUGGEST_CREATE_DATASET"; then
+ GROONGA_SUGGEST_CREATE_DATASET="`make -s -C $top_dir echo-groonga-suggest-create-dataset`"
+fi
+export GROONGA_SUGGEST_CREATE_DATASET
+
GRN_PLUGINS_DIR="$top_dir/plugins"
export GRN_PLUGINS_DIR
@@ -48,5 +53,6 @@ fi
$RUBY -I "$groonga_test_dir/lib" \
"$groonga_test_dir/bin/groonga-test" \
--groonga "$GROONGA" \
+ --groonga-suggest-create-dataset "$GROONGA_SUGGEST_CREATE_DATASET" \
--base-directory "$BASE_DIR" \
"$BASE_DIR/suite" "$@"