diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 15:21:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 15:21:06 +0000 |
| commit | 9de406c280501629b1b87f5f5c601289897a3e8e (patch) | |
| tree | 4e857f7a079c63beb4c0e1616db01cb81ac7f980 /test/ruby | |
| parent | 170ae1e56c25713673d1f8205c0c4068083e6b53 (diff) | |
merges r20053 and r20067 from trunk into ruby_1_9_1.
* ruby.c (moreswitches): splits option string and passes arguments.
* ruby.c (proc_options): checks if allowed in RUBYOPT.
* ruby.c (process_options): allows long style options in RUBYOPT.
* ruby.c (load_file_internal): ditto in shebang. [ruby-dev:36979]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index ebe6023b04..c55c99d0d1 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -199,12 +199,16 @@ class TestRubyOptions < Test::Unit::TestCase ENV['RUBYOPT'] = ' - -' assert_in_out_err([], "", [], []) + assert_in_out_err(['-e', 'p $:.include?(".")'], "", ["true"], []) + ENV['RUBYOPT'] = '-e "p 1"' assert_in_out_err([], "", [], /invalid switch in RUBYOPT: -e \(RuntimeError\)/) ENV['RUBYOPT'] = '-T1' assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/) + assert_in_out_err(['-e', 'p $:.include?(".")'], "", ["false"], []) + ENV['RUBYOPT'] = '-T4' assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/) |