usa	2012-10-25 18:16:08 +0900 (Thu, 25 Oct 2012)

  New Revision: 37324

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

  Log:
    merge revision(s) 37032:
    
    test_gem_installer.rb: restore ARGV
    
    * test/rubygems/test_gem_installer.rb
      (TestGemInstaller#test_install_creates_binstub_that_dont_trust_encoding):
      restore ARGV properly, non-ascii strings in different encodings are
      not equal.  [ruby-core:45975] [Bug #6673]

  Modified files:
    branches/ruby_1_9_3/test/rubygems/test_gem_installer.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37323)
+++ ruby_1_9_3/version.h	(revision 37324)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 299
+#define RUBY_PATCHLEVEL 300
 
 #define RUBY_RELEASE_DATE "2012-10-25"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/rubygems/test_gem_installer.rb
===================================================================
--- ruby_1_9_3/test/rubygems/test_gem_installer.rb	(revision 37323)
+++ ruby_1_9_3/test/rubygems/test_gem_installer.rb	(revision 37324)
@@ -747,7 +747,8 @@
 
     exe = File.join @gemhome, 'bin', 'executable'
 
-    ARGV.unshift "\xE4pfel".force_encoding("UTF-8")
+    extra_arg = "\xE4pfel".force_encoding("UTF-8")
+    ARGV.unshift extra_arg
 
     begin
       Gem::Specification.reset
@@ -756,7 +757,7 @@
         instance_eval File.read(exe)
       end
     ensure
-      ARGV.shift if ARGV.first == "\xE4pfel"
+      ARGV.shift if ARGV.first == extra_arg
     end
 
     assert_match(/ran executable/, e.message)

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