pass variables to test runner.

mroonga · Apr 8, 2011 · 427088b · 427088b
1 parent db51b18
commit 427088b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -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)
diff --git a/configure.ac b/configure.ac
@@ -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],

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -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)