diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | test/ruby/beginmainend.rb | 9 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 10 | ||||
-rw-r--r-- | test/ruby/test_beginendblock.rb | 12 | ||||
-rw-r--r-- | test/ruby/test_system.rb | 7 |
5 files changed, 43 insertions, 5 deletions
@@ -1,3 +1,13 @@ +Sun Oct 5 11:54:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * test/ruby/envutil.rb: added. split "rubybin" from test_system.rb. + + * test/ruby/test_system.rb: use envutil.rb + + * test/ruby/test_beginendblock.rb: added. + + * test/ruby/beginmainend.rb: added. used in test_beginendblock.rb. + Sun Oct 5 11:23:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org> * test/testunit/runit/test_testresult.rb: removed some unnecessary diff --git a/test/ruby/beginmainend.rb b/test/ruby/beginmainend.rb new file mode 100644 index 0000000000..4ee1d7899a --- /dev/null +++ b/test/ruby/beginmainend.rb @@ -0,0 +1,9 @@ +BEGIN { + puts "begin" +} + +puts "main" + +END { + puts "end" +} diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb new file mode 100644 index 0000000000..3f0fed3ad5 --- /dev/null +++ b/test/ruby/envutil.rb @@ -0,0 +1,10 @@ +module EnvUtil + def rubybin + if File.exist? "miniruby" or File.exist? "miniruby.exe" + "./miniruby" + else + "ruby" + end + end + module_function :rubybin +end diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb new file mode 100644 index 0000000000..301d2c62f5 --- /dev/null +++ b/test/ruby/test_beginendblock.rb @@ -0,0 +1,12 @@ +require 'test/unit' +require "#{File.dirname(File.expand_path(__FILE__))}/envutil" + +class TestBeginEndBlock < Test::Unit::TestCase + DIR = File.dirname(File.expand_path(__FILE__)) + + def test_beginendblock + ruby = EnvUtil.rubybin + io = IO.popen("\"#{ruby}\" \"#{DIR}/beginmainend.rb\"") + assert_equal("begin\nmain\nend\n", io.read) + end +end diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb index a3da43459f..da4deb5a04 100644 --- a/test/ruby/test_system.rb +++ b/test/ruby/test_system.rb @@ -1,4 +1,5 @@ require 'test/unit' +require "#{File.dirname(File.expand_path(__FILE__))}/envutil" $KCODE = 'none' @@ -8,11 +9,7 @@ class TestSystem < Test::Unit::TestCase end def test_system - if File.exist? "miniruby" or File.exist? "miniruby.exe" - ruby = "./miniruby" - else - ruby = "ruby" - end + ruby = EnvUtil.rubybin assert_equal("foobar\n", `echo foobar`) assert_equal('foobar', `#{ruby} -e 'print "foobar"'`) |