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]

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

2 files changed, 4 insertions, 3 deletions

diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index d40fbc93bf..9b36120f8e 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -747,7 +747,8 @@ load Gem.bin_path('a', 'executable', version)
 
     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 @@ load Gem.bin_path('a', 'executable', version)
         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)
diff --git a/version.h b/version.h
index 99ff57d096..e9b90dbd8e 100644
--- a/version.h
+++ b/version.h
@@ -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