diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-11 10:57:46 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-11 10:57:46 +0000 |
| commit | a8ae1416fc1dd576a2e4f42fc2ab69a0141776b9 (patch) | |
| tree | dddb53725c4e6c0a249f84a4a0029248ffb7b7b2 /test | |
| parent | 93b187ffb96d6d2e5f44eadca3445d3065c0da88 (diff) | |
merge revision(s) 33730: [Bug #6574]
* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
RbConfig::CONFIG["LIBPATHENV"]. [Bug #5135] [ruby-core:38653]
* test/webrick/test_filehandler.rb (class WEBrick): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/webrick/test_cgi.rb | 1 | ||||
| -rw-r--r-- | test/webrick/test_filehandler.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index 11853161b1..0ef1b37e4f 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -14,6 +14,7 @@ class TestWEBrickCGI < Test::Unit::TestCase def req.meta_vars meta = super meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR) + meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] return meta end }, diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index bcdb3dfed0..f78ba5cbfc 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -252,6 +252,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase def req.meta_vars meta = super meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR) + meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] return meta end }, |