usa	2012-10-25 18:11:09 +0900 (Thu, 25 Oct 2012)

  New Revision: 37323

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37323

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/etc/test_etc.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37322)
+++ ruby_1_9_3/ChangeLog	(revision 37323)
@@ -1,3 +1,7 @@
+Thu Oct 25 17:55:01 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
+
 Thu Oct 25 16:59:17 2012  Luis Lavena  <luislavena@g...>
 
 	* test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37322)
+++ ruby_1_9_3/version.h	(revision 37323)
@@ -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
Index: ruby_1_9_3/test/etc/test_etc.rb
===================================================================
--- ruby_1_9_3/test/etc/test_etc.rb	(revision 37322)
+++ ruby_1_9_3/test/etc/test_etc.rb	(revision 37323)
@@ -38,7 +38,7 @@
       assert_include(s, Etc.getpwuid(uid))
     end
     s = passwd[Process.euid]
-    if s
+    unless s.empty?
       assert_include(s, Etc.getpwuid)
     end
   end

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