Kouhei Sutou
null+****@clear*****
Fri Oct 4 12:15:43 JST 2013
Kouhei Sutou 2013-10-04 12:15:43 +0900 (Fri, 04 Oct 2013) New Revision: 17f31529473d68e40047b38055b2377299bf1057 https://github.com/groonga/groonga/commit/17f31529473d68e40047b38055b2377299bf1057 Message: Pass path information to test scripts by a sh script instead of make targets It is for supporting testing on CMake build. Added files: config.sh.in Modified files: .gitignore Makefile.am configure.ac test/command/run-test.sh test/unit/run-test.sh Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2013-10-04 11:15:16 +0900 (5aed22e) +++ .gitignore 2013-10-04 12:15:43 +0900 (dd3880e) @@ -22,6 +22,7 @@ /config.lt /config.status /config.sub +/config.sh /configure /depcomp /dist Modified: Makefile.am (+0 -22) =================================================================== --- Makefile.am 2013-10-04 11:15:16 +0900 (6b7b6a4) +++ Makefile.am 2013-10-04 12:15:43 +0900 (f4c4be2) @@ -106,28 +106,6 @@ update-document: done -echo-cutter: - @echo $(CUTTER) - -if WITH_RUBY -echo-ruby: - @echo $(RUBY) -else -echo-ruby: -endif - -echo-groonga: - @echo $(GROONGA) - -echo-groonga-httpd: - @echo $(GROONGA_HTTPD) - -echo-groonga-suggest-create-dataset: - @echo $(GROONGA_SUGGEST_CREATE_DATASET) - -echo-groonga-benchmark: - @echo $(GROONGA_BENCHMARK) - update-version: @if test -z "$(NEW_VERSION)"; then \ echo "\$$(NEW_VERSION) is missing"; \ Added: config.sh.in (+6 -0) 100644 =================================================================== --- /dev/null +++ config.sh.in 2013-10-04 12:15:43 +0900 (b4cec3c) @@ -0,0 +1,6 @@ +export CUTTER="@CUTTER@" +export RUBY="@RUBY@" +export GROONGA="@GROONGA@" +export GROONGA_HTTPD="@GROONGA_HTTPD@" +export GROONGA_SUGGEST_CREATE_DATASET="@GROONGA_SUGGEST_CREATE_DATASET@" +export GROONGA_BENCHMARK="@GROONGA_BENCHMARK@" Modified: configure.ac (+5 -4) =================================================================== --- configure.ac 2013-10-04 11:15:16 +0900 (be9c1d8) +++ configure.ac 2013-10-04 12:15:43 +0900 (d508fac) @@ -657,15 +657,15 @@ AC_SUBST(WINDOWS_LDFLAGS) AC_SUBST(WINDOWS_LIBS) # groonga binary path -GROONGA="\$(abs_top_builddir)/src/groonga" +GROONGA="${ac_pwd}/src/groonga" AC_SUBST(GROONGA) # groonga-benchmark binary path -GROONGA_BENCHMARK="\$(abs_top_builddir)/src/groonga-benchmark" +GROONGA_BENCHMARK="${ac_pwd}/src/groonga-benchmark" AC_SUBST(GROONGA_BENCHMARK) # groonga-suggest-create-dataset binary path -GROONGA_SUGGEST_CREATE_DATASET="\$(abs_top_builddir)/src/suggest/groonga-suggest-create-dataset" +GROONGA_SUGGEST_CREATE_DATASET="${ac_pwd}/src/suggest/groonga-suggest-create-dataset" AC_SUBST(GROONGA_SUGGEST_CREATE_DATASET) # check Cutter with GLib support if available @@ -1252,7 +1252,7 @@ NGINX_VERSION=nginx_version AC_SUBST(NGINX_VERSION) # groonga-httpd binary path -GROONGA_HTTPD="\$(abs_top_builddir)/vendor/nginx-${NGINX_VERSION}/objs/nginx" +GROONGA_HTTPD="${ac_pwd}/vendor/nginx-${NGINX_VERSION}/objs/nginx" AC_SUBST(GROONGA_HTTPD) AC_ARG_ENABLE(groonga_httpd, @@ -1359,6 +1359,7 @@ AC_OUTPUT([ packages/rpm/fedora/groonga.spec packages/apt/debian/groonga-keyring.postrm groonga.pc + config.sh groonga-httpd-conf.sh data/groonga-httpd.conf data/scripts/groonga-httpd-restart Modified: test/command/run-test.sh (+1 -19) =================================================================== --- test/command/run-test.sh 2013-10-04 11:15:16 +0900 (cc5ad74) +++ test/command/run-test.sh 2013-10-04 12:15:43 +0900 (40dcc7b) @@ -30,25 +30,7 @@ if test x"$NO_MAKE" != x"yes"; then make -C $top_dir ${MAKE_ARGS} > /dev/null || exit 1 fi -if test -z "$RUBY"; then - RUBY="`make -s -C $top_dir echo-ruby`" -fi -export RUBY - -if test -z "$GROONGA"; then - GROONGA="`make -s -C $top_dir echo-groonga`" -fi -export GROONGA - -if test -z "$GROONGA_HTTPD"; then - GROONGA_HTTPD="`make -s -C $top_dir echo-groonga-httpd`" -fi -export GROONGA_HTTPD - -if test -z "$GROONGA_SUGGEST_CREATE_DATASET"; then - GROONGA_SUGGEST_CREATE_DATASET="`make -s -C $top_dir echo-groonga-suggest-create-dataset`" -fi -export GROONGA_SUGGEST_CREATE_DATASET +. "${top_dir}/config.sh" GRN_PLUGINS_DIR="$top_dir/plugins" export GRN_PLUGINS_DIR Modified: test/unit/run-test.sh (+1 -19) =================================================================== --- test/unit/run-test.sh 2013-10-04 11:15:16 +0900 (4288e21) +++ test/unit/run-test.sh 2013-10-04 12:15:43 +0900 (039ee06) @@ -25,25 +25,7 @@ if test x"$NO_MAKE" != x"yes"; then make $MAKE_ARGS -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 -export RUBY - -if test -z "$GROONGA"; then - GROONGA="`make -s -C $top_dir echo-groonga`" -fi -export GROONGA - -if test -z "$GROONGA_BENCHMARK"; then - GROONGA_BENCHMARK="`make -s -C $top_dir echo-groonga-benchmark`" -fi -export GROONGA_BENCHMARK +. "${top_dir}/config.sh" TZ=Asia/Tokyo export TZ -------------- next part -------------- HTML����������������������������...Download