nobu	2008-06-27 21:19:11 +0900 (Fri, 27 Jun 2008)

  New Revision: 17612

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/lib/test/unit/ui/console/testrunner.rb
    branches/mvm/test/inlinetest.rb
    branches/ruby_1_8/ChangeLog
    trunk/ChangeLog
    trunk/lib/test/unit/ui/console/testrunner.rb
    trunk/test/inlinetest.rb

  Log:
    * test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
      $0.  [ruby-dev:35261]
    
    * lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/lib/test/unit/ui/console/testrunner.rb?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/test/inlinetest.rb?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/inlinetest.rb?r1=17612&r2=17611&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/test/unit/ui/console/testrunner.rb?r1=17612&r2=17611&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17611)
+++ ChangeLog	(revision 17612)
@@ -1,3 +1,10 @@
+Fri Jun 27 21:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
 Fri Jun 27 17:45:17 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* lib/erb.rb: adjust line number for magic comment.
Index: lib/test/unit/ui/console/testrunner.rb
===================================================================
--- lib/test/unit/ui/console/testrunner.rb	(revision 17611)
+++ lib/test/unit/ui/console/testrunner.rb	(revision 17612)
@@ -90,8 +90,11 @@
           end
           
           def test_started(name)
-            $0 += "\0#{name}"
-            $0.sub!(/\0.*\z/, '')
+            unless defined? $program_name
+              $program_name = $0
+              alias $0 $program_name
+            end
+            $PROGRAM_NAME += "\0#{name}"
             output_single(name + ": ", VERBOSE)
           end
           
Index: test/inlinetest.rb
===================================================================
--- test/inlinetest.rb	(revision 17611)
+++ test/inlinetest.rb	(revision 17612)
@@ -33,12 +33,12 @@
   end
 
   def self.in_progname(progname)
-    progname_backup = $0.dup
-    $0.replace(progname)
+    $program_name = progname
+    alias $0 $program_name
     begin
       yield
     ensure
-      $0.replace(progname_backup)
+      alias $0 $PROGRAM_NAME
     end
   end
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17611)
+++ ruby_1_8/ChangeLog	(revision 17612)
@@ -1,3 +1,10 @@
+Fri Jun 27 21:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
 Fri Jun 27 15:05:06 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (-IF-NO-STRING-LITERAL-CONCATENATION-): make description
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17611)
+++ mvm/ChangeLog	(revision 17612)
@@ -1,3 +1,10 @@
+Fri Jun 27 21:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
 Fri Jun 27 13:29:26 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
Index: mvm/lib/test/unit/ui/console/testrunner.rb
===================================================================
--- mvm/lib/test/unit/ui/console/testrunner.rb	(revision 17611)
+++ mvm/lib/test/unit/ui/console/testrunner.rb	(revision 17612)
@@ -90,8 +90,11 @@
           end
           
           def test_started(name)
-            $0 += "\0#{name}"
-            $0.sub!(/\0.*\z/, '')
+            unless defined? $program_name
+              $program_name = $0
+              alias $0 $program_name
+            end
+            $PROGRAM_NAME += "\0#{name}"
             output_single(name + ": ", VERBOSE)
           end
           
Index: mvm/test/inlinetest.rb
===================================================================
--- mvm/test/inlinetest.rb	(revision 17611)
+++ mvm/test/inlinetest.rb	(revision 17612)
@@ -33,12 +33,12 @@
   end
 
   def self.in_progname(progname)
-    progname_backup = $0.dup
-    $0.replace(progname)
+    $program_name = progname
+    alias $0 $program_name
     begin
       yield
     ensure
-      $0.replace(progname_backup)
+      alias $0 $PROGRAM_NAME
     end
   end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/