merges r20245 and r20246 from trunk into ruby_1_9_1.

* lib/logger.rb (ProgName): fixed for svn, based on a patch from
  Nobuhiro IMAI at [ruby-dev:37108].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index c7d553c413..a6c132d0f3 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -23,6 +23,10 @@ class TestLogger < Test::Unit::TestCase
     @logger = Logger.new(nil)
   end
 
+  def test_const_progname
+    assert %r!\Alogger\.rb/\S+\z! === Logger::ProgName
+  end
+
   class Log
     attr_reader :label, :datetime, :pid, :severity, :progname, :msg
     def initialize(line)