null+****@clear*****
null+****@clear*****
2012年 6月 15日 (金) 12:19:49 JST
Kouhei Sutou 2012-06-15 12:19:49 +0900 (Fri, 15 Jun 2012)
New Revision: 465ac0733d8ff381cd109e2bdb01de875c32c958
Log:
test: set groonga-httpd path
Maybe, it will be src/httpd/groonga-httpd. :-)
Modified files:
Makefile.am
configure.ac
test/function/run-test.sh
Modified: Makefile.am (+3 -0)
===================================================================
--- Makefile.am 2012-06-15 10:58:34 +0900 (a52b670)
+++ Makefile.am 2012-06-15 12:19:49 +0900 (751bbd9)
@@ -124,6 +124,9 @@ endif
echo-groonga:
@echo $(GROONGA)
+echo-groonga-httpd:
+ @echo $(GROONGA_HTTPD)
+
echo-groonga-suggest-create-dataset:
@echo $(GROONGA_SUGGEST_CREATE_DATASET)
Modified: configure.ac (+4 -0)
===================================================================
--- configure.ac 2012-06-15 10:58:34 +0900 (6cea064)
+++ configure.ac 2012-06-15 12:19:49 +0900 (f207127)
@@ -611,6 +611,10 @@ AC_SUBST(WINDOWS_LIBS)
GROONGA="\$(abs_top_builddir)/src/groonga"
AC_SUBST(GROONGA)
+# groonga-httpd binary path
+GROONGA="\$(abs_top_builddir)/src/httpd/groonga-httpd"
+AC_SUBST(GROONGA_HTTPD)
+
# groonga-benchmark binary path
GROONGA_BENCHMARK="\$(abs_top_builddir)/src/groonga-benchmark"
AC_SUBST(GROONGA_BENCHMARK)
Modified: test/function/run-test.sh (+6 -0)
===================================================================
--- test/function/run-test.sh 2012-06-15 10:58:34 +0900 (734de57)
+++ test/function/run-test.sh 2012-06-15 12:19:49 +0900 (1e42bfb)
@@ -23,6 +23,11 @@ if test -z "$GROONGA"; then
fi
export GROONGA
+if test -z "$GROONGA_HTTPD"; then
+ GROONGA_HTTPD="`make -s -C $top_dir echo-groonga-httpd`"
+fi
+export GROONGA_HTTPD
+
if test -z "$GROONGA_SUGGEST_CREATE_DATASET"; then
GROONGA_SUGGEST_CREATE_DATASET="`make -s -C $top_dir echo-groonga-suggest-create-dataset`"
fi
@@ -82,6 +87,7 @@ fi
$RUBY -I "$grntest_dir/lib" \
"$grntest_dir/bin/grntest" \
--groonga "$GROONGA" \
+ --groonga-httpd "$GROONGA_HTTPD" \
--groonga-suggest-create-dataset "$GROONGA_SUGGEST_CREATE_DATASET" \
--base-directory "$BASE_DIR" \
"${grntest_options[@]}"