null+****@clear*****
null+****@clear*****
2012年 4月 3日 (火) 12:01:18 JST
Kouhei Sutou 2012-04-03 12:01:18 +0900 (Tue, 03 Apr 2012)
New Revision: 9fb2e15179268b3ec928d16d978d296d3e889322
Log:
test: export GRNTEST as groonga-benchmark path
Modified files:
Makefile.am
configure.ac
test/unit/Makefile.am
test/unit/run-test.sh
Modified: Makefile.am (+3 -0)
===================================================================
--- Makefile.am 2012-04-03 11:49:10 +0900 (dd61069)
+++ Makefile.am 2012-04-03 12:01:18 +0900 (c3376dd)
@@ -117,6 +117,9 @@ echo-groonga:
echo-groonga-suggest-create-dataset:
@echo $(GROONGA_SUGGEST_CREATE_DATASET)
+echo-groonga-benchmark:
+ @echo $(GROONGA_BENCHMARK)
+
update-version:
@if test -z "$(NEW_VERSION)"; then \
echo "\$$(NEW_VERSION) is missing"; \
Modified: configure.ac (+3 -3)
===================================================================
--- configure.ac 2012-04-03 11:49:10 +0900 (205b55a)
+++ configure.ac 2012-04-03 12:01:18 +0900 (8bb17cd)
@@ -613,9 +613,9 @@ AC_SUBST(WINDOWS_LIBS)
GROONGA="\$(abs_top_builddir)/src/groonga"
AC_SUBST(GROONGA)
-# grntest binary path
-GRNTEST="\$(abs_top_builddir)/src/grntest"
-AC_SUBST(GRNTEST)
+# groonga-benchmark binary path
+GROONGA_BENCHMARK="\$(abs_top_builddir)/src/groonga-benchmark"
+AC_SUBST(GROONGA_BENCHMARK)
# groonga-suggest-create-dataset binary path
GROONGA_SUGGEST_CREATE_DATASET="\$(abs_top_builddir)/src/suggest/groonga-suggest-create-dataset"
Modified: test/unit/Makefile.am (+1 -1)
===================================================================
--- test/unit/Makefile.am 2012-04-03 11:49:10 +0900 (cca3741)
+++ test/unit/Makefile.am 2012-04-03 12:01:18 +0900 (26beb55)
@@ -19,7 +19,7 @@ TESTS_ENVIRONMENT = \
CUTTER_VERBOSE=yes \
RUBY="$(RUBY)" \
GROONGA="$(GROONGA)" \
- GRNTEST="$(GRNTEST)"
+ GRNTEST="$(GROONGA_BENCHMARK)"
if WITH_CUTTER
noinst_LTLIBRARIES = suite-groonga-test.la
Modified: test/unit/run-test.sh (+5 -0)
===================================================================
--- test/unit/run-test.sh 2012-04-03 11:49:10 +0900 (163ad7f)
+++ test/unit/run-test.sh 2012-04-03 12:01:18 +0900 (db0b625)
@@ -28,6 +28,11 @@ if test -z "$GROONGA"; then
fi
export GROONGA
+if test -z "$GRNTEST"; then
+ GRNTEST="`make -s -C $top_dir echo-groonga-benchmark`"
+fi
+export GRNTEST
+
CUTTER_ARGS=
CUTTER_WRAPPER=
if test x"$CUTTER_DEBUG" = x"yes"; then