[test] run make at the first.

mroonga · Nov 26, 2011 · b78ca7e · b78ca7e
1 parent e85fceb
commit b78ca7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = unit sql
 
 TESTS = run-sql-test.sh
 TESTS_ENVIRONMENT =				\
+	NO_MAKE="yes"				\
 	MYSQL_SOURCE="$(MYSQL_SOURCE)"		\
 	MYSQL_BUILD="$(MYSQL_BUILD)"		\
 	MYSQL_VERSION="$(MYSQL_VERSION)"

diff --git a/test/run-sql-test.sh b/test/run-sql-test.sh
@@ -3,6 +3,10 @@
 export BASE_DIR="$(cd $(dirname $0); pwd)"
 top_dir="$BASE_DIR/.."
 
+if test "$NO_MAKE" != "yes"; then
+    make -C ${top_dir} > /dev/null || exit 1
+fi
+
 if test -z "$MYSQL_SOURCE"; then
     MYSQL_SOURCE="$(make -s -C $top_dir echo-mysql-source)"
 fi
@@ -81,7 +85,6 @@ for test_suite_name in $(echo $test_suite_names | sed -e 's/,/ /g'); do
     fi
 done
 
-make -C ${top_dir} > /dev/null || exit 1
 if test -n "${plugins_dir}"; then
     make -C ${top_dir} \
 	install-pluginLTLIBRARIES \