null+****@clear*****
null+****@clear*****
2012年 3月 5日 (月) 22:35:04 JST
Kouhei Sutou 2012-03-05 22:35:04 +0900 (Mon, 05 Mar 2012)
New Revision: 9c82eb34d686ace27ffbbe54d02c0e97362ce80b
Log:
Support make check in test/function
Modified files:
test/function/Makefile.am
test/function/run-test.sh
Modified: test/function/Makefile.am (+5 -0)
===================================================================
--- test/function/Makefile.am 2012-03-05 22:30:03 +0900 (bba0994)
+++ test/function/Makefile.am 2012-03-05 22:35:04 +0900 (8a805a1)
@@ -6,6 +6,11 @@ SUBDIRS = \
if WITH_FUNCTION_TEST
TESTS = run-test.sh
endif
+TESTS_ENVIRONMENT = \
+ NO_MAKE=yes \
+ BUILD_DIR="$(builddir)" \
+ RUBY="$(RUBY)" \
+ GROONGA="$(GROONGA)"
EXTRA_DIST = \
run-test.sh
Modified: test/function/run-test.sh (+0 -5)
===================================================================
--- test/function/run-test.sh 2012-03-05 22:30:03 +0900 (8a536d7)
+++ test/function/run-test.sh 2012-03-05 22:35:04 +0900 (801e5d3)
@@ -13,11 +13,6 @@ if test x"$NO_MAKE" != x"yes"; then
make -C $top_dir > /dev/null || exit 1
fi
-if test -z "$CUTTER"; then
- CUTTER="`make -s -C $top_dir echo-cutter`"
-fi
-export CUTTER
-
if test -z "$RUBY"; then
RUBY="`make -s -C $top_dir echo-ruby`"
fi