null+****@clear*****
null+****@clear*****
2010年 11月 23日 (火) 17:20:20 JST
Kouhei Sutou 2010-11-23 08:20:20 +0000 (Tue, 23 Nov 2010)
New Revision: fec490fd69cd55213554961748499ace2041ae57
Log:
cleanup.
Modified files:
test/unit/lib/ruby/groonga-test-utils.rb
Modified: test/unit/lib/ruby/groonga-test-utils.rb (+6 -3)
===================================================================
--- test/unit/lib/ruby/groonga-test-utils.rb 2010-11-23 08:18:31 +0000 (d458e18)
+++ test/unit/lib/ruby/groonga-test-utils.rb 2010-11-23 08:20:20 +0000 (ba4160a)
@@ -68,6 +68,10 @@ module GroongaTestUtils
File.expand_path(groonga)
end
+ def groonga
+ @groonga ||= guess_groonga_path
+ end
+
def guess_resource_dir
File.join(guess_top_source_dir, "resource", "admin_html")
end
@@ -91,7 +95,7 @@ module GroongaTestUtils
arguments.concat(["--protocol", @protocol]) if @protocol
arguments.concat(["-n", @database_path])
@groonga_pid = fork do
- exec(@groonga, *arguments)
+ exec(groonga, *arguments)
end
sleep 0.3 # wait for groonga server initialize
@@ -204,8 +208,7 @@ module GroongaTestUtils
end
def invoke_groonga(*args)
- @groonga ||= guess_groonga_path
- args.unshift(@groonga)
+ args.unshift(groonga)
invoke_command(*args)
end