Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:32:35 JST 2012
Kouhei Sutou 2011-11-26 16:12:47 +0900 (Sat, 26 Nov 2011) New Revision: b78ca7ed0c32c9ad38800443908c9ad17e2c5834 https://github.com/mroonga/mroonga/commit/b78ca7ed0c32c9ad38800443908c9ad17e2c5834 Log: [test] run make at the first. Modified files: test/Makefile.am test/run-sql-test.sh Modified: test/Makefile.am (+1 -0) =================================================================== --- test/Makefile.am 2011-11-26 15:39:01 +0900 (3f9df72) +++ test/Makefile.am 2011-11-26 16:12:47 +0900 (be8dc01) @@ -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)" Modified: test/run-sql-test.sh (+4 -1) =================================================================== --- test/run-sql-test.sh 2011-11-26 15:39:01 +0900 (10caadb) +++ test/run-sql-test.sh 2011-11-26 16:12:47 +0900 (4a85f46) @@ -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 \ -------------- next part -------------- HTML����������������������������...Download