summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 12:19:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 12:19:11 +0000
commit4bcf877beb7bc1b61f5e6c542619c7991fb5e399 (patch)
tree56c3a5cc9af144f1cf9bf1b40028f322df960f95
parent8f03e4d2c574a46c81a9c9a59472d650345de64a (diff)
* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
$0. [ruby-dev:35261] * lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/test/unit/ui/console/testrunner.rb7
-rw-r--r--test/inlinetest.rb6
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d8c7b6e8bf..96ea8c3db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 27 21:19:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@mbf.nifty.com>
* lib/erb.rb: adjust line number for magic comment.
diff --git a/lib/test/unit/ui/console/testrunner.rb b/lib/test/unit/ui/console/testrunner.rb
index 2bd01eefa8..1495300463 100644
--- a/lib/test/unit/ui/console/testrunner.rb
+++ b/lib/test/unit/ui/console/testrunner.rb
@@ -90,8 +90,11 @@ module Test
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
diff --git a/test/inlinetest.rb b/test/inlinetest.rb
index 6dbd793f10..46287364a9 100644
--- a/test/inlinetest.rb
+++ b/test/inlinetest.rb
@@ -33,12 +33,12 @@ module InlineTest
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