null+****@clear*****
null+****@clear*****
2011年 4月 8日 (金) 19:28:01 JST
Kouhei Sutou 2011-04-08 10:28:01 +0000 (Fri, 08 Apr 2011)
New Revision: 427088bc441d288a3fd547a41e228c348de792a3
Log:
pass variables to test runner.
Modified files:
Makefile.am
configure.ac
test/Makefile.am
Modified: Makefile.am (+12 -0)
===================================================================
--- Makefile.am 2011-04-08 10:27:20 +0000 (1cbdd49)
+++ Makefile.am 2011-04-08 10:28:01 +0000 (2365a97)
@@ -51,3 +51,15 @@ update-latest-release:
rpm/fedora/mysql-groonga.spec.in \
rpm/centos/mysql-groonga.spec.in \
debian/changelog
+
+echo-mysql-source:
+ echo $(MYSQL_SOURCE)
+
+echo-mysql-build:
+ echo $(MYSQL_BUILD)
+
+echo-mysql-version:
+ echo $(MYSQL_VERSION)
+
+echo-cutter:
+ echo $(CUTTER)
Modified: configure.ac (+2 -0)
===================================================================
--- configure.ac 2011-04-08 10:27:20 +0000 (926ae06)
+++ configure.ac 2011-04-08 10:28:01 +0000 (cb7362f)
@@ -43,6 +43,8 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
],
[AC_MSG_ERROR([--with-mysql-source=PATH is required for standalone build])]
)
+ MYSQL_SOURCE="$ac_mysql_source_dir"
+ AC_SUBST(MYSQL_SOURCE)
ac_mysql_build_dir=
AC_ARG_WITH([mysql-build],
Modified: test/Makefile.am (+4 -7)
===================================================================
--- test/Makefile.am 2011-04-08 10:27:20 +0000 (5cf616f)
+++ test/Makefile.am 2011-04-08 10:28:01 +0000 (3f9df72)
@@ -1,7 +1,10 @@
SUBDIRS = unit sql
TESTS = run-sql-test.sh
-TESTS_ENVIRONMENT = MYSQL_BUILD="$(MYSQL_BUILD)"
+TESTS_ENVIRONMENT = \
+ MYSQL_SOURCE="$(MYSQL_SOURCE)" \
+ MYSQL_BUILD="$(MYSQL_BUILD)" \
+ MYSQL_VERSION="$(MYSQL_VERSION)"
if WITH_CUTTER
TESTS += run-unit-test.sh
@@ -11,9 +14,3 @@ endif
EXTRA_DIST = \
run-unit-test.sh \
run-sql-test.sh
-
-echo-mysql-build:
- echo $(MYSQL_BUILD)
-
-echo-cutter:
- echo $(CUTTER)