From db7f24b362bf9a0831f9a6f12ac0f1a21e476cf0 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 25 Sep 2006 06:07:36 +0000
Subject: [PATCH] * 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
---
 ChangeLog                | 6 ++++++
 sample/test.rb           | 2 +-
 test/ruby/test_system.rb | 2 +-
 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")