summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-25 06:07:36 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-25 06:07:36 +0000
commitdb7f24b362bf9a0831f9a6f12ac0f1a21e476cf0 (patch)
tree36953f84899bbec86a106933eb15d57c0cc5bae7
parent5cc2093ccd5c91fe2eeb0e9a7757985569eed1c2 (diff)
* sample/test.rb: "print nil" now prints empty string.
* test/ruby/test_system.rb (TestSystem::test_system): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--sample/test.rb2
-rw-r--r--test/ruby/test_system.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ee94254e0..6aaf4d9a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 25 15:06:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sample/test.rb: "print nil" now prints empty string.
+
+ * test/ruby/test_system.rb (TestSystem::test_system): ditto.
+
Mon Sep 25 11:26:25 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (recursive_hash): remove unused local variable.
diff --git a/sample/test.rb b/sample/test.rb
index b785d2db9f..a5026d49c8 100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -1839,7 +1839,7 @@ tmp.print "__END__\n";
tmp.print "this is a trailing junk\n";
tmp.close
-test_ok(`./miniruby -x script_tmp` == 'nil')
+test_ok(`./miniruby -x script_tmp` == '')
test_ok(`./miniruby -x script_tmp -zzz=555` == '555')
tmp = open("script_tmp", "w")
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index 298f3c0435..4cd93738f9 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -33,7 +33,7 @@ class TestSystem < Test::Unit::TestCase
tmp.print "this is a trailing junk\n";
tmp.close
- assert_equal('nil', `#{ruby} -x script_tmp`)
+ assert_equal('', `#{ruby} -x script_tmp`)
assert_equal('555', `#{ruby} -x script_tmp -zzz=555`)
tmp = open("script_tmp", "w")