null+****@clear*****
null+****@clear*****
2012年 4月 3日 (火) 12:02:49 JST
Kouhei Sutou 2012-04-03 12:02:49 +0900 (Tue, 03 Apr 2012)
New Revision: 9c4c409b18119109294ba7d7f28488afb7d06b4a
Log:
tet: GRNTEST -> GROONGA_BENCHMARK
Modified files:
test/unit/Makefile.am
test/unit/lib/ruby/groonga-grntest-test-utils.rb
test/unit/run-test.sh
Modified: test/unit/Makefile.am (+1 -1)
===================================================================
--- test/unit/Makefile.am 2012-04-03 12:01:18 +0900 (26beb55)
+++ test/unit/Makefile.am 2012-04-03 12:02:49 +0900 (c85ad41)
@@ -19,7 +19,7 @@ TESTS_ENVIRONMENT = \
CUTTER_VERBOSE=yes \
RUBY="$(RUBY)" \
GROONGA="$(GROONGA)" \
- GRNTEST="$(GROONGA_BENCHMARK)"
+ GROONGA_BENCHMARK="$(GROONGA_BENCHMARK)"
if WITH_CUTTER
noinst_LTLIBRARIES = suite-groonga-test.la
Modified: test/unit/lib/ruby/groonga-grntest-test-utils.rb (+2 -2)
===================================================================
--- test/unit/lib/ruby/groonga-grntest-test-utils.rb 2012-04-03 12:01:18 +0900 (5440e90)
+++ test/unit/lib/ruby/groonga-grntest-test-utils.rb 2012-04-03 12:02:49 +0900 (961ec5e)
@@ -37,8 +37,8 @@ module GroongaGrntestTestUtils
private
def guess_grntest_path
- grntest = ENV["GRNTEST"]
- grntest ||= File.join(guess_top_source_dir, "src", "grntest")
+ grntest = ENV["GROONGA_BENCHMARK"]
+ grntest ||= File.join(guess_top_source_dir, "src", "groonga-benchmark")
File.expand_path(grntest)
end
Modified: test/unit/run-test.sh (+3 -3)
===================================================================
--- test/unit/run-test.sh 2012-04-03 12:01:18 +0900 (db0b625)
+++ test/unit/run-test.sh 2012-04-03 12:02:49 +0900 (d649d9a)
@@ -28,10 +28,10 @@ if test -z "$GROONGA"; then
fi
export GROONGA
-if test -z "$GRNTEST"; then
- GRNTEST="`make -s -C $top_dir echo-groonga-benchmark`"
+if test -z "$GROONGA_BENCHMARK"; then
+ GROONGA_BENCHMARK="`make -s -C $top_dir echo-groonga-benchmark`"
fi
-export GRNTEST
+export GROONGA_BENCHMARK
CUTTER_ARGS=
CUTTER_WRAPPER=