merge revision(s) 36636:

	* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.


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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 61eeb53456..997babc169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 25 17:55:01 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
+
 Thu Oct 25 16:59:17 2012  Luis Lavena  <luislavena@gmail.com>
 
 	* test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
index b73a95f995..5bc8db431c 100644
--- a/test/etc/test_etc.rb
+++ b/test/etc/test_etc.rb
@@ -38,7 +38,7 @@ class TestEtc < Test::Unit::TestCase
       assert_include(s, Etc.getpwuid(uid))
     end
     s = passwd[Process.euid]
-    if s
+    unless s.empty?
       assert_include(s, Etc.getpwuid)
     end
   end
diff --git a/version.h b/version.h
index 5de0e0ec32..99ff57d096 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 298
+#define RUBY_PATCHLEVEL 299
 
 #define RUBY_RELEASE_DATE "2012-10-25"
 #define RUBY_RELEASE_YEAR 2012