ruby-changes:14652
From: yugui <ko1@a...>
Date: Sat, 30 Jan 2010 22:06:53 +0900 (JST)
Subject: [ruby-changes:14652] Ruby:r26500 (ruby_1_9_1): merges r25435 from trunk into ruby_1_9_1.
yugui 2010-01-30 21:51:59 +0900 (Sat, 30 Jan 2010) New Revision: 26500 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26500 Log: merges r25435 from trunk into ruby_1_9_1. -- * test/ruby/envutil.rb (assert_in_out_err): test_stdout and test_stderr should be an array. * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of assert_in_out_err should be a string. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/test/ruby/envutil.rb branches/ruby_1_9_1/test/ruby/test_rubyoptions.rb branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 26499) +++ ruby_1_9_1/ChangeLog (revision 26500) @@ -1,3 +1,11 @@ +Thu Oct 22 20:20:27 2009 Tanaka Akira <akr@f...> + + * test/ruby/envutil.rb (assert_in_out_err): test_stdout and + test_stderr should be an array. + + * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of + assert_in_out_err should be a string. + Tue Oct 20 16:41:18 2009 NAKAMURA Usaku <usa@r...> * include/ruby/win32.h (finite, scalb): inline'ed non-standard Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 26499) +++ ruby_1_9_1/version.h (revision 26500) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 405 +#define RUBY_PATCHLEVEL 406 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_1/test/ruby/envutil.rb =================================================================== --- ruby_1_9_1/test/ruby/envutil.rb (revision 26499) +++ ruby_1_9_1/test/ruby/envutil.rb (revision 26500) @@ -115,7 +115,7 @@ end LANG_ENVS = %w"LANG LC_ALL LC_CTYPE" - def assert_in_out_err(args, test_stdin = "", test_stdout = "", test_stderr = "", message = nil) + def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil) in_c, in_p = IO.pipe out_p, out_c = IO.pipe err_p, err_c = IO.pipe Index: ruby_1_9_1/test/ruby/test_rubyoptions.rb =================================================================== --- ruby_1_9_1/test/ruby/test_rubyoptions.rb (revision 26499) +++ ruby_1_9_1/test/ruby/test_rubyoptions.rb (revision 26500) @@ -295,4 +295,13 @@ ensure t.close(true) if t end + + def test_notfound + notexist = "./notexist.rb" + rubybin = Regexp.quote(EnvUtil.rubybin) + pat = /\A#{rubybin}:.* -- #{Regexp.quote(notexist)} \(LoadError\)\Z/ + assert_equal(false, File.exist?(notexist)) + assert_in_out_err(["-r", notexist, "-ep"], "", [], pat) + assert_in_out_err([notexist], "", [], pat) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/